From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Aug 2015 18:01:26 +0000 (-0700)
Subject: Merge branch 'pt/am-tests'
X-Git-Tag: v2.6.0-rc0~91
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/980a3d3dd742d534b394b04e578c2de5e3ee4793?ds=inline;hp=-c

Merge branch 'pt/am-tests'

* pt/am-tests:
t3901: test git-am encoding conversion
t3418: non-interactive rebase --continue with rerere enabled
t4150: tests for am --[no-]scissors
t4150: am with post-applypatch hook
t4150: am with pre-applypatch hook
t4150: am with applypatch-msg hook
t4150: am --resolved fails if index has unmerged entries
t4150: am --resolved fails if index has no changes
t4150: am refuses patches when paused
t4151: am --abort will keep dirty index intact
t4150: am fails if index is dirty
t4150: am.messageid really adds the message id
---

980a3d3dd742d534b394b04e578c2de5e3ee4793
diff --combined t/t4150-am.sh
index 3320fa6315,67fbf0e1c9..e9b6f8158a
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@@ -67,6 -67,19 +67,19 @@@ test_expect_success 'setup: messages' 
  
  	EOF
  
+ 	cat >scissors-msg <<-\EOF &&
+ 	Test git-am with scissors line
+ 
+ 	This line should be included in the commit message.
+ 	EOF
+ 
+ 	cat - scissors-msg >no-scissors-msg <<-\EOF &&
+ 	This line should not be included in the commit message with --scissors enabled.
+ 
+ 	 - - >8 - - remove everything above this line - - >8 - -
+ 
+ 	EOF
+ 
  	signoff="Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
  '
  
@@@ -104,39 -117,21 +117,53 @@@ test_expect_success setup 
  		echo "X-Fake-Field: Line Three" &&
  		git format-patch --stdout first | sed -e "1d"
  	} > patch1-ws.eml &&
 +	{
 +		sed -ne "1p" msg &&
 +		echo &&
 +		echo "From: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" &&
 +		echo "Date: $GIT_AUTHOR_DATE" &&
 +		echo &&
 +		sed -e "1,2d" msg &&
 +		echo &&
 +		echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" &&
 +		echo "---" &&
 +		git diff-tree --no-commit-id --stat -p second
 +	} >patch1-stgit.eml &&
 +	mkdir stgit-series &&
 +	cp patch1-stgit.eml stgit-series/patch &&
 +	{
 +		echo "# This series applies on GIT commit $(git rev-parse first)" &&
 +		echo "patch"
 +	} >stgit-series/series &&
 +	{
 +		echo "# HG changeset patch" &&
 +		echo "# User $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" &&
 +		echo "# Date $test_tick 25200" &&
 +		echo "#      $(git show --pretty="%aD" -s second)" &&
 +		echo "# Node ID $_z40" &&
 +		echo "# Parent  $_z40" &&
 +		cat msg &&
 +		echo &&
 +		echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" &&
 +		echo &&
 +		git diff-tree --no-commit-id -p second
 +	} >patch1-hg.eml &&
 +
  
+ 	echo scissors-file >scissors-file &&
+ 	git add scissors-file &&
+ 	git commit -F scissors-msg &&
+ 	git tag scissors &&
+ 	git format-patch --stdout scissors^ >scissors-patch.eml &&
+ 	git reset --hard HEAD^ &&
+ 
+ 	echo no-scissors-file >no-scissors-file &&
+ 	git add no-scissors-file &&
+ 	git commit -F no-scissors-msg &&
+ 	git tag no-scissors &&
+ 	git format-patch --stdout no-scissors^ >no-scissors-patch.eml &&
+ 	git reset --hard HEAD^ &&
+ 
  	sed -n -e "3,\$p" msg >file &&
  	git add file &&
  	test_tick &&
@@@ -186,6 -181,18 +213,18 @@@ test_expect_success 'am applies patch c
  	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
  '
  
+ test_expect_success 'am fails if index is dirty' '
+ 	test_when_finished "rm -f dirtyfile" &&
+ 	rm -fr .git/rebase-apply &&
+ 	git reset --hard &&
+ 	git checkout first &&
+ 	echo dirtyfile >dirtyfile &&
+ 	git add dirtyfile &&
+ 	test_must_fail git am patch1 &&
+ 	test_path_is_dir .git/rebase-apply &&
+ 	test_cmp_rev first HEAD
+ '
+ 
  test_expect_success 'am applies patch e-mail not in a mbox' '
  	rm -fr .git/rebase-apply &&
  	git reset --hard &&
@@@ -219,56 -226,133 +258,183 @@@ test_expect_success 'am applies patch e
  	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
  '
  
 +test_expect_success 'am applies stgit patch' '
 +	rm -fr .git/rebase-apply &&
 +	git checkout -f first &&
 +	git am patch1-stgit.eml &&
 +	test_path_is_missing .git/rebase-apply &&
 +	git diff --exit-code second &&
 +	test_cmp_rev second HEAD &&
 +	test_cmp_rev second^ HEAD^
 +'
 +
 +test_expect_success 'am --patch-format=stgit applies stgit patch' '
 +	rm -fr .git/rebase-apply &&
 +	git checkout -f first &&
 +	git am --patch-format=stgit <patch1-stgit.eml &&
 +	test_path_is_missing .git/rebase-apply &&
 +	git diff --exit-code second &&
 +	test_cmp_rev second HEAD &&
 +	test_cmp_rev second^ HEAD^
 +'
 +
 +test_expect_success 'am applies stgit series' '
 +	rm -fr .git/rebase-apply &&
 +	git checkout -f first &&
 +	git am stgit-series/series &&
 +	test_path_is_missing .git/rebase-apply &&
 +	git diff --exit-code second &&
 +	test_cmp_rev second HEAD &&
 +	test_cmp_rev second^ HEAD^
 +'
 +
 +test_expect_success 'am applies hg patch' '
 +	rm -fr .git/rebase-apply &&
 +	git checkout -f first &&
 +	git am patch1-hg.eml &&
 +	test_path_is_missing .git/rebase-apply &&
 +	git diff --exit-code second &&
 +	test_cmp_rev second HEAD &&
 +	test_cmp_rev second^ HEAD^
 +'
 +
 +test_expect_success 'am --patch-format=hg applies hg patch' '
 +	rm -fr .git/rebase-apply &&
 +	git checkout -f first &&
 +	git am --patch-format=hg <patch1-hg.eml &&
 +	test_path_is_missing .git/rebase-apply &&
 +	git diff --exit-code second &&
 +	test_cmp_rev second HEAD &&
 +	test_cmp_rev second^ HEAD^
 +'
 +
+ test_expect_success 'am with applypatch-msg hook' '
+ 	test_when_finished "rm -f .git/hooks/applypatch-msg" &&
+ 	rm -fr .git/rebase-apply &&
+ 	git reset --hard &&
+ 	git checkout first &&
+ 	mkdir -p .git/hooks &&
+ 	write_script .git/hooks/applypatch-msg <<-\EOF &&
+ 	cat "$1" >actual-msg &&
+ 	echo hook-message >"$1"
+ 	EOF
+ 	git am patch1 &&
+ 	test_path_is_missing .git/rebase-apply &&
+ 	git diff --exit-code second &&
+ 	echo hook-message >expected &&
+ 	git log -1 --format=format:%B >actual &&
+ 	test_cmp expected actual &&
+ 	git log -1 --format=format:%B second >expected &&
+ 	test_cmp expected actual-msg
+ '
+ 
+ test_expect_success 'am with failing applypatch-msg hook' '
+ 	test_when_finished "rm -f .git/hooks/applypatch-msg" &&
+ 	rm -fr .git/rebase-apply &&
+ 	git reset --hard &&
+ 	git checkout first &&
+ 	mkdir -p .git/hooks &&
+ 	write_script .git/hooks/applypatch-msg <<-\EOF &&
+ 	exit 1
+ 	EOF
+ 	test_must_fail git am patch1 &&
+ 	test_path_is_dir .git/rebase-apply &&
+ 	git diff --exit-code first &&
+ 	test_cmp_rev first HEAD
+ '
+ 
+ test_expect_success 'am with pre-applypatch hook' '
+ 	test_when_finished "rm -f .git/hooks/pre-applypatch" &&
+ 	rm -fr .git/rebase-apply &&
+ 	git reset --hard &&
+ 	git checkout first &&
+ 	mkdir -p .git/hooks &&
+ 	write_script .git/hooks/pre-applypatch <<-\EOF &&
+ 	git diff first >diff.actual
+ 	exit 0
+ 	EOF
+ 	git am patch1 &&
+ 	test_path_is_missing .git/rebase-apply &&
+ 	git diff --exit-code second &&
+ 	test_cmp_rev second HEAD &&
+ 	git diff first..second >diff.expected &&
+ 	test_cmp diff.expected diff.actual
+ '
+ 
+ test_expect_success 'am with failing pre-applypatch hook' '
+ 	test_when_finished "rm -f .git/hooks/pre-applypatch" &&
+ 	rm -fr .git/rebase-apply &&
+ 	git reset --hard &&
+ 	git checkout first &&
+ 	mkdir -p .git/hooks &&
+ 	write_script .git/hooks/pre-applypatch <<-\EOF &&
+ 	exit 1
+ 	EOF
+ 	test_must_fail git am patch1 &&
+ 	test_path_is_dir .git/rebase-apply &&
+ 	git diff --exit-code second &&
+ 	test_cmp_rev first HEAD
+ '
+ 
+ test_expect_success 'am with post-applypatch hook' '
+ 	test_when_finished "rm -f .git/hooks/post-applypatch" &&
+ 	rm -fr .git/rebase-apply &&
+ 	git reset --hard &&
+ 	git checkout first &&
+ 	mkdir -p .git/hooks &&
+ 	write_script .git/hooks/post-applypatch <<-\EOF &&
+ 	git rev-parse HEAD >head.actual
+ 	git diff second >diff.actual
+ 	exit 0
+ 	EOF
+ 	git am patch1 &&
+ 	test_path_is_missing .git/rebase-apply &&
+ 	test_cmp_rev second HEAD &&
+ 	git rev-parse second >head.expected &&
+ 	test_cmp head.expected head.actual &&
+ 	git diff second >diff.expected &&
+ 	test_cmp diff.expected diff.actual
+ '
+ 
+ test_expect_success 'am with failing post-applypatch hook' '
+ 	test_when_finished "rm -f .git/hooks/post-applypatch" &&
+ 	rm -fr .git/rebase-apply &&
+ 	git reset --hard &&
+ 	git checkout first &&
+ 	mkdir -p .git/hooks &&
+ 	write_script .git/hooks/post-applypatch <<-\EOF &&
+ 	git rev-parse HEAD >head.actual
+ 	exit 1
+ 	EOF
+ 	git am patch1 &&
+ 	test_path_is_missing .git/rebase-apply &&
+ 	git diff --exit-code second &&
+ 	test_cmp_rev second HEAD &&
+ 	git rev-parse second >head.expected &&
+ 	test_cmp head.expected head.actual
+ '
+ 
+ test_expect_success 'am --scissors cuts the message at the scissors line' '
+ 	rm -fr .git/rebase-apply &&
+ 	git reset --hard &&
+ 	git checkout second &&
+ 	git am --scissors scissors-patch.eml &&
+ 	test_path_is_missing .git/rebase-apply &&
+ 	git diff --exit-code scissors &&
+ 	test_cmp_rev scissors HEAD
+ '
+ 
+ test_expect_success 'am --no-scissors overrides mailinfo.scissors' '
+ 	rm -fr .git/rebase-apply &&
+ 	git reset --hard &&
+ 	git checkout second &&
+ 	test_config mailinfo.scissors true &&
+ 	git am --no-scissors no-scissors-patch.eml &&
+ 	test_path_is_missing .git/rebase-apply &&
+ 	git diff --exit-code no-scissors &&
+ 	test_cmp_rev no-scissors HEAD
+ '
+ 
  test_expect_success 'setup: new author and committer' '
  	GIT_AUTHOR_NAME="Another Thor" &&
  	GIT_AUTHOR_EMAIL="a.thor@example.com" &&
@@@ -385,6 -469,25 +551,6 @@@ test_expect_success 'am -3 -p0 can rea
  	git diff --exit-code lorem
  '
  
 -test_expect_success 'am with config am.threeWay falls back to 3-way merge' '
 -	rm -fr .git/rebase-apply &&
 -	git reset --hard &&
 -	git checkout -b lorem4 base3way &&
 -	test_config am.threeWay 1 &&
 -	git am lorem-move.patch &&
 -	test_path_is_missing .git/rebase-apply &&
 -	git diff --exit-code lorem
 -'
 -
 -test_expect_success 'am with config am.threeWay overridden by --no-3way' '
 -	rm -fr .git/rebase-apply &&
 -	git reset --hard &&
 -	git checkout -b lorem5 base3way &&
 -	test_config am.threeWay 1 &&
 -	test_must_fail git am --no-3way lorem-move.patch &&
 -	test_path_is_dir .git/rebase-apply
 -'
 -
  test_expect_success 'am can rename a file' '
  	grep "^rename from" rename.patch &&
  	rm -fr .git/rebase-apply &&
@@@ -448,6 -551,20 +614,20 @@@ test_expect_success 'am --abort remove
  	test_path_is_missing .git/rebase-apply
  '
  
+ test_expect_success 'am refuses patches when paused' '
+ 	rm -fr .git/rebase-apply &&
+ 	git reset --hard &&
+ 	git checkout lorem2^^ &&
+ 
+ 	test_must_fail git am lorem-move.patch &&
+ 	test_path_is_dir .git/rebase-apply &&
+ 	test_cmp_rev lorem2^^ HEAD &&
+ 
+ 	test_must_fail git am <lorem-move.patch &&
+ 	test_path_is_dir .git/rebase-apply &&
+ 	test_cmp_rev lorem2^^ HEAD
+ '
+ 
  test_expect_success 'am --resolved works' '
  	echo goodbye >expected &&
  	rm -fr .git/rebase-apply &&
@@@ -462,6 -579,31 +642,31 @@@
  	test_cmp expected another
  '
  
+ test_expect_success 'am --resolved fails if index has no changes' '
+ 	rm -fr .git/rebase-apply &&
+ 	git reset --hard &&
+ 	git checkout lorem2^^ &&
+ 	test_must_fail git am lorem-move.patch &&
+ 	test_path_is_dir .git/rebase-apply &&
+ 	test_cmp_rev lorem2^^ HEAD &&
+ 	test_must_fail git am --resolved &&
+ 	test_path_is_dir .git/rebase-apply &&
+ 	test_cmp_rev lorem2^^ HEAD
+ '
+ 
+ test_expect_success 'am --resolved fails if index has unmerged entries' '
+ 	rm -fr .git/rebase-apply &&
+ 	git reset --hard &&
+ 	git checkout second &&
+ 	test_must_fail git am -3 lorem-move.patch &&
+ 	test_path_is_dir .git/rebase-apply &&
+ 	test_cmp_rev second HEAD &&
+ 	test_must_fail git am --resolved >err &&
+ 	test_path_is_dir .git/rebase-apply &&
+ 	test_cmp_rev second HEAD &&
+ 	test_i18ngrep "still have unmerged paths" err
+ '
+ 
  test_expect_success 'am takes patches from a Pine mailbox' '
  	rm -fr .git/rebase-apply &&
  	git reset --hard &&
@@@ -626,6 -768,18 +831,18 @@@ test_expect_success 'am --message-id re
  	test_cmp expected actual
  '
  
+ test_expect_success 'am.messageid really adds the message id' '
+ 	rm -fr .git/rebase-apply &&
+ 	git reset --hard &&
+ 	git checkout HEAD^ &&
+ 	test_config am.messageid true &&
+ 	git am patch1.eml &&
+ 	test_path_is_missing .git/rebase-apply &&
+ 	git cat-file commit HEAD | tail -n1 >actual &&
+ 	grep Message-Id patch1.eml >expected &&
+ 	test_cmp expected actual
+ '
+ 
  test_expect_success 'am --message-id -s signs off after the message id' '
  	rm -fr .git/rebase-apply &&
  	git reset --hard &&