diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:29 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 14:45:29 -0800 |
commit | 8b0db484e11aa86e6b8bf4d7243d0c81bf4b3c33 (patch) | |
tree | d0e440bbe46deef7d2009cb11191c21ee55047ed /commit.h | |
parent | eff96d7e16a769dca9b0319ccf460a83f514676e (diff) | |
parent | 967dfd4d568c2b102281de8cc22ee35f7558358b (diff) | |
download | git-8b0db484e11aa86e6b8bf4d7243d0c81bf4b3c33.tar.gz |
Merge branch 'jt/use-trailer-api-in-commands'
Commands that operate on a log message and add lines to the trailer
blocks, such as "format-patch -s", "cherry-pick (-x|-s)", and
"commit -s", have been taught to use the logic of and share the
code with "git interpret-trailer".
* jt/use-trailer-api-in-commands:
sequencer: use trailer's trailer layout
trailer: have function to describe trailer layout
trailer: avoid unnecessary splitting on lines
commit: make ignore_non_trailer take buf/len
trailer: be stricter in parsing separators
Diffstat (limited to 'commit.h')
-rw-r--r-- | commit.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -355,7 +355,7 @@ extern const char *find_commit_header(const char *msg, const char *key, size_t *out_len); /* Find the end of the log message, the right place for a new trailer. */ -extern int ignore_non_trailer(struct strbuf *sb); +extern int ignore_non_trailer(const char *buf, size_t len); typedef void (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra, void *cb_data); |