git/notes-utils.c, branch v2.6.2

notes: extract parse_notes_merge_strategy to notes-utils

2015-08-17T22:38:32Z

Signed-off-by: Jacob Keller Signed-off-by: Junio C Hamano

use strbuf_complete_line() for adding a newline if needed

2014-12-12T19:23:45Z

Call strbuf_complete_line() instead of open-coding it. Also remove surrounding comments indicating the intent to complete a line since this information is already included in the function name. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'jk/commit-buffer-length'

2014-07-02T19:53:02Z

Move "commit->buffer" out of the in-core commit object and keep track of their lengths. Use this to optimize the code paths to validate GPG signatures in commit objects. * jk/commit-buffer-length: reuse cached commit buffer when parsing signatures commit: record buffer length in cache commit: convert commit->buffer to a slab commit-slab: provide a static initializer use get_commit_buffer everywhere convert logmsg_reencode to get_commit_buffer use get_commit_buffer to avoid duplicate code use get_cached_commit_buffer where appropriate provide helpers to access the commit buffer provide a helper to set the commit buffer provide a helper to free commit buffer sequencer: use logmsg_reencode in get_message logmsg_reencode: return const buffer do not create "struct commit" with xcalloc commit: push commit_index update into alloc_commit_node alloc: include any-object allocations in alloc_report replace dangerous uses of strbuf_attach commit_tree: take a pointer/len pair rather than a const strbuf

commit_tree: take a pointer/len pair rather than a const strbuf

2014-06-12T17:29:41Z

While strbufs are pretty common throughout our code, it is more flexible for functions to take a pointer/len pair than a strbuf. It's easy to turn a strbuf into such a pair (by dereferencing its members), but less easy to go the other way (you can strbuf_attach, but that has implications about memory ownership). This patch teaches commit_tree (and its associated callers and sub-functions) to take such a pair for the commit message rather than a strbuf. This makes passing the buffer around slightly more verbose, but means we can get rid of some dangerous strbuf_attach calls in the next patch. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

refs.h: rename the action_on_err constants

2014-04-07T19:09:11Z

Given that these constants are only being used when updating references, it is inappropriate to give them such generic names as "DIE_ON_ERR". So prefix their names with "UPDATE_REFS_". Signed-off-by: Michael Haggerty Signed-off-by: Junio C Hamano

notes-utils: handle boolean notes.rewritemode correctly

2014-02-18T23:51:29Z

If we carry on after outputting config_error_nonbool then we're guaranteed to dereference a null pointer. Signed-off-by: John Keeping Signed-off-by: Junio C Hamano

Merge branch 'cc/starts-n-ends-with'

2013-12-17T20:02:44Z

Remove a few duplicate implementations of prefix/suffix comparison functions, and rename them to starts_with and ends_with. * cc/starts-n-ends-with: replace {pre,suf}fixcmp() with {starts,ends}_with() strbuf: introduce starts_with() and ends_with() builtin/remote: remove postfixcmp() and use suffixcmp() instead environment: normalize use of prefixcmp() by removing " != 0"

replace {pre,suf}fixcmp() with {starts,ends}_with()

2013-12-05T22:13:21Z

assume parse_commit checks for NULL commit

2013-10-24T22:43:50Z

The parse_commit function will check whether it was passed a NULL commit pointer, and if so, return an error. There is no need for callers to check this separately. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Move create_notes_commit() from notes-merge.c into notes-utils.c

2013-06-12T17:38:13Z

create_notes_commit() is needed by both the notes-merge code, and by commit_notes() in notes-utils. Since it is generally useful, and not bound to the notes-merge machinery, we move it from (the more specific) notes-merge to (the more general) notes-utils. Signed-off-by: Johan Herland Signed-off-by: Junio C Hamano