diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-09-08 15:34:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-08 15:35:05 -0700 |
| commit | d6a2b05cbb63b1a923e2bb614dedfca83014f870 (patch) | |
| tree | 779a3056080b1e2045ad276559e756c453ddb380 /t | |
| parent | Sync with maint (diff) | |
| parent | am: match --signoff to the original scripted version (diff) | |
| download | tgif-d6a2b05cbb63b1a923e2bb614dedfca83014f870.tar.xz | |
Merge branch 'jc/builtin-am-signoff-regression-fix'
Recent "git am" had regression when adding a Signed-off-by line
with its "-s" option by an unintended tightening of how an existing
trailer block is detected.
* jc/builtin-am-signoff-regression-fix:
am: match --signoff to the original scripted version
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4150-am.sh | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index af6053a242..b41bd17264 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -909,4 +909,52 @@ test_expect_success 'am -3 works with rerere' ' test_cmp expect file ' +test_expect_success 'am -s unexpected trailer block' ' + rm -fr .git/rebase-apply && + git reset --hard && + echo signed >file && + git add file && + cat >msg <<-EOF && + subject here + + Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> + [jc: tweaked log message] + Signed-off-by: J C H <j@c.h> + EOF + git commit -F msg && + git cat-file commit HEAD | sed -e '1,/^$/d' >original && + git format-patch --stdout -1 >patch && + + git reset --hard HEAD^ && + git am -s patch && + ( + cat original && + echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" + ) >expect && + git cat-file commit HEAD | sed -e '1,/^$/d' >actual && + test_cmp expect actual && + + cat >msg <<-\EOF && + subject here + + We make sure that there is a blank line between the log + message proper and Signed-off-by: line added. + EOF + git reset HEAD^ && + git commit -F msg file && + git cat-file commit HEAD | sed -e '1,/^$/d' >original && + git format-patch --stdout -1 >patch && + + git reset --hard HEAD^ && + git am -s patch && + + ( + cat original && + echo && + echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" + ) >expect && + git cat-file commit HEAD | sed -e '1,/^$/d' >actual && + test_cmp expect actual +' + test_done |