diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2017-08-08 11:25:33 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-08-08 12:27:23 -0700 |
| commit | 735285b403ee2b09c03d31f2dc8cc95a2d471ead (patch) | |
| tree | 6c89845cd8826aa6904aae517f7963b57e073d6f /compat | |
| parent | Git 2.13.4 (diff) | |
| download | tgif-735285b403ee2b09c03d31f2dc8cc95a2d471ead.tar.xz | |
am: fix signoff when other trailers are present
If there was no 'Signed-off-by:' trailer but another trailer such as
'Reported-by:' then 'git am --signoff' would add a blank line between
the existing trailers and the added 'Signed-off-by:' line. e.g.
Rebase accepts '--rerere-autoupdate' as an option but only honors
it if '-m' is also given. Fix it for a non-interactive rebase by
passing on the option to 'git am' and 'git cherry-pick'.
Reported-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Fix by using the code provided for this purpose in sequencer.c.
Change the tests so that they check the formatting of the
'Signed-off-by:' lines rather than just grepping for them.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions