path: root/builtin/commit.c
diff options
authorJunio C Hamano <>2013-04-01 15:59:23 (GMT)
committerJunio C Hamano <>2013-04-01 15:59:24 (GMT)
commit900c8ecb5c98c3cae256dcc030476392fdf2bbf2 (patch)
tree4f5964bf298f9aa94fdc67e0cc880550b33de438 /builtin/commit.c
parentf161fb041eb682af8bae56f31f75bf0065557b95 (diff)
parent8c613fd5efa1c3bbd48845ed91c533192e699c08 (diff)
Merge branch 'bc/append-signed-off-by'
Consolidate codepaths that inspect log-message-to-be and decide to add a new Signed-off-by line in various commands. * bc/append-signed-off-by: git-commit: populate the edit buffer with 2 blank lines before s-o-b Unify appending signoff in format-patch, commit and sequencer format-patch: update append_signoff prototype t4014: more tests about appending s-o-b lines sequencer.c: teach append_signoff to avoid adding a duplicate newline sequencer.c: teach append_signoff how to detect duplicate s-o-b sequencer.c: always separate "(cherry picked from" from commit body sequencer.c: require a conforming footer to be preceded by a blank line sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer t/t3511: add some tests of 'cherry-pick -s' functionality t/ allow to specify the tag name to test_commit commit, cherry-pick -s: remove broken support for multiline rfc2822 fields sequencer.c: rework search for start of footer to improve clarity
Diffstat (limited to 'builtin/commit.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit.c b/builtin/commit.c
index d21d07a..4620437 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -702,7 +702,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
previous = eol;
- append_signoff(&sb, ignore_footer);
+ append_signoff(&sb, ignore_footer, 0);
if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len)