diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-04-01 08:59:23 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-01 08:59:24 -0700 |
commit | 900c8ecb5c98c3cae256dcc030476392fdf2bbf2 (patch) | |
tree | 4f5964bf298f9aa94fdc67e0cc880550b33de438 /revision.h | |
parent | f161fb041eb682af8bae56f31f75bf0065557b95 (diff) | |
parent | 8c613fd5efa1c3bbd48845ed91c533192e699c08 (diff) | |
download | git-900c8ecb5c98c3cae256dcc030476392fdf2bbf2.tar.gz |
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/test-lib-functions.sh: 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 'revision.h')
-rw-r--r-- | revision.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.h b/revision.h index 5da09ee3ef..01bd2b7c07 100644 --- a/revision.h +++ b/revision.h @@ -138,7 +138,7 @@ struct rev_info { int reroll_count; char *message_id; struct string_list *ref_message_ids; - const char *add_signoff; + int add_signoff; const char *extra_headers; const char *log_reencode; const char *subject_prefix; |