git/commit.c, branch v2.12.2

Merge branch 'rs/commit-parsing-optim' into maint

2017-03-21T22:03:29Z

The code that parses header fields in the commit object has been updated for (micro)performance and code hygiene. * rs/commit-parsing-optim: commit: don't check for space twice when looking for header commit: be more precise when searching for headers

commit: don't check for space twice when looking for header

2017-02-27T19:20:18Z

Both standard_header_field() and excluded_header_field() check if there's a space after the buffer that's handed to them. We already check in the caller if that space is present. Don't bother calling the functions if it's missing, as they are guaranteed to return 0 in that case, and remove the now redundant checks from them. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

commit: be more precise when searching for headers

2017-02-27T19:20:17Z

Search for a space character only within the current line in read_commit_extra_header_lines() instead of searching in the whole buffer (and possibly beyond, if it's not NUL-terminated) and then discarding any results after the end of the current line. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

commit: make ignore_non_trailer take buf/len

2016-11-29T22:22:18Z

Make ignore_non_trailer take a buf/len pair instead of struct strbuf. Signed-off-by: Jonathan Tan Signed-off-by: Junio C Hamano

Merge branch 'rs/copy-array' into maint

2016-10-11T21:18:32Z

Code cleanup. * rs/copy-array: use COPY_ARRAY add COPY_ARRAY

Merge branch 'rs/copy-array'

2016-10-03T20:30:33Z

Code cleanup. * rs/copy-array: use COPY_ARRAY add COPY_ARRAY

use COPY_ARRAY

2016-09-25T23:44:13Z

Add a semantic patch for converting certain calls of memcpy(3) to COPY_ARRAY() and apply that transformation to the code base. The result is shorter and safer code. For now only consider calls where source and destination have the same type, or in other words: easy cases. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

i18n: commit: mark message for translation

2016-09-19T17:55:36Z

Mark message commit_utf8_warn for translation. Update tests to reflect changes. Signed-off-by: Vasco Almeida Signed-off-by: Junio C Hamano

Merge branch 'rs/pull-signed-tag'

2016-08-19T22:34:14Z

When "git merge-recursive" works on history with many criss-cross merges in "verbose" mode, the names the command assigns to the virtual merge bases could have overwritten each other by unintended reuse of the same piece of memory. * rs/pull-signed-tag: commit: use FLEX_ARRAY in struct merge_remote_desc merge-recursive: fix verbose output for multiple base trees commit: factor out set_merge_remote_desc() commit: use xstrdup() in get_merge_parent()

commit: use FLEX_ARRAY in struct merge_remote_desc

2016-08-14T02:48:07Z

Convert the name member of struct merge_remote_desc to a FLEX_ARRAY and use FLEX_ALLOC_STR to build the struct. This halves the number of memory allocations, saves the storage for a pointer and avoids an indirection when reading the name. Suggested-by: Jeff King Signed-off-by: Rene Scharfe Reviewed-by: Jeff King Signed-off-by: Junio C Hamano