From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 Sep 2015 22:34:57 +0000 (-0700)
Subject: Merge branch 'jc/builtin-am-signoff-regression-fix'
X-Git-Tag: v2.6.0-rc1~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6a2b05cbb63b1a923e2bb614dedfca83014f870;p=thirdparty%2Fgit.git

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
---

d6a2b05cbb63b1a923e2bb614dedfca83014f870
diff --cc t/t4150-am.sh
index af6053a242,5e4855595b..b41bd17264
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@@ -873,40 -873,52 +873,88 @@@ test_expect_success 'am --message-id -
  	test_cmp expected actual
  '
  
 +test_expect_success 'am -3 works with rerere' '
 +	rm -fr .git/rebase-apply &&
 +	git reset --hard &&
 +
 +	# make patches one->two and two->three...
 +	test_commit one file &&
 +	test_commit two file &&
 +	test_commit three file &&
 +	git format-patch -2 --stdout >seq.patch &&
 +
 +	# and create a situation that conflicts...
 +	git reset --hard one &&
 +	test_commit other file &&
 +
 +	# enable rerere...
 +	test_config rerere.enabled true &&
 +	test_when_finished "rm -rf .git/rr-cache" &&
 +
 +	# ...and apply. Our resolution is to skip the first
 +	# patch, and the rerere the second one.
 +	test_must_fail git am -3 seq.patch &&
 +	test_must_fail git am --skip &&
 +	echo resolved >file &&
 +	git add file &&
 +	git am --resolved &&
 +
 +	# now apply again, and confirm that rerere engaged (we still
 +	# expect failure from am because rerere does not auto-commit
 +	# for us).
 +	git reset --hard other &&
 +	test_must_fail git am -3 seq.patch &&
 +	test_must_fail git am --skip &&
 +	echo resolved >expect &&
 +	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