diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-19 23:45:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-19 23:45:29 +0100 |
| commit | 8b0db484e11aa86e6b8bf4d7243d0c81bf4b3c33 (patch) | |
| tree | d0e440bbe46deef7d2009cb11191c21ee55047ed /builtin | |
| parent | First batch for 2.12 (diff) | |
| parent | sequencer: use trailer's trailer layout (diff) | |
| download | git-8b0db484e11aa86e6b8bf4d7243d0c81bf4b3c33.tar.xz git-8b0db484e11aa86e6b8bf4d7243d0c81bf4b3c33.zip | |
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 'builtin')
| -rw-r--r-- | builtin/commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 8976c3d29b..887ccc7577 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -790,7 +790,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix, strbuf_stripspace(&sb, 0); if (signoff) - append_signoff(&sb, ignore_non_trailer(&sb), 0); + append_signoff(&sb, ignore_non_trailer(sb.buf, sb.len), 0); if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len) die_errno(_("could not write commit template")); |