[thirdparty/git.git] / t / t4150-am.sh

#!/bin/sh

test_description='git am running'

. ./test-lib.sh

test_expect_success 'setup: messages' '
	cat >msg <<-\EOF &&
	second

	Lorem ipsum dolor sit amet, consectetuer sadipscing elitr, sed diam nonumy
	eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
	voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita
	kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem
	ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
	tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
	vero eos et accusam et justo duo dolores et ea rebum.

	EOF
	q_to_tab <<-\EOF >>msg &&
	QDuis autem vel eum iriure dolor in hendrerit in vulputate velit
	Qesse molestie consequat, vel illum dolore eu feugiat nulla facilisis
	Qat vero eros et accumsan et iusto odio dignissim qui blandit
	Qpraesent luptatum zzril delenit augue duis dolore te feugait nulla
	Qfacilisi.
	EOF
	cat >>msg <<-\EOF &&

	Lorem ipsum dolor sit amet,
	consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut
	laoreet dolore magna aliquam erat volutpat.

	  git
	  ---
	  +++

	Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit
	lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure
	dolor in hendrerit in vulputate velit esse molestie consequat, vel illum
	dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio
	dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te
	feugait nulla facilisi.
	EOF

	cat >failmail <<-\EOF &&
	From foo@example.com Fri May 23 10:43:49 2008
	From:	foo@example.com
	To:	bar@example.com
	Subject: Re: [RFC/PATCH] git-foo.sh
	Date:	Fri, 23 May 2008 05:23:42 +0200

	Sometimes we have to find out that there'\''s nothing left.

	EOF

	cat >pine <<-\EOF &&
	From MAILER-DAEMON Fri May 23 10:43:49 2008
	Date: 23 May 2008 05:23:42 +0200
	From: Mail System Internal Data <MAILER-DAEMON@example.com>
	Subject: DON'\''T DELETE THIS MESSAGE -- FOLDER INTERNAL DATA
	Message-ID: <foo-0001@example.com>

	This text is part of the internal format of your mail folder, and is not
	a real message.  It is created automatically by the mail system software.
	If deleted, important folder data will be lost, and it will be re-created
	with the data reset to initial values.

	EOF

	signoff="Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
'

test_expect_success setup '
	echo hello >file &&
	git add file &&
	test_tick &&
	git commit -m first &&
	git tag first &&

	echo world >>file &&
	git add file &&
	test_tick &&
	git commit -s -F msg &&
	git tag second &&

	git format-patch --stdout first >patch1 &&
	{
		echo "X-Fake-Field: Line One" &&
		echo "X-Fake-Field: Line Two" &&
		echo "X-Fake-Field: Line Three" &&
		git format-patch --stdout first | sed -e "1d"
	} > patch1.eml &&
	{
		echo "X-Fake-Field: Line One" &&
		echo "X-Fake-Field: Line Two" &&
		echo "X-Fake-Field: Line Three" &&
		git format-patch --stdout first | sed -e "1d"
	} | append_cr >patch1-crlf.eml &&

	sed -n -e "3,\$p" msg >file &&
	git add file &&
	test_tick &&
	git commit -m third &&

	git format-patch --stdout first >patch2	&&

	git checkout -b lorem &&
	sed -n -e "11,\$p" msg >file &&
	head -n 9 msg >>file &&
	test_tick &&
	git commit -a -m "moved stuff" &&

	echo goodbye >another &&
	git add another &&
	test_tick &&
	git commit -m "added another file" &&

	git format-patch --stdout master >lorem-move.patch &&

	git checkout -b rename &&
	git mv file renamed &&
	git commit -m "renamed a file" &&

	git format-patch -M --stdout lorem >rename.patch &&

	git reset --soft lorem^ &&
	git commit -m "renamed a file and added another" &&

	git format-patch -M --stdout lorem^ >rename-add.patch &&

	# reset time
	unset test_tick &&
	test_tick
'

test_expect_success 'am applies patch correctly' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout first &&
	test_tick &&
	git am <patch1 &&
	! test -d .git/rebase-apply &&
	git diff --exit-code second &&
	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
'

test_expect_success 'am applies patch e-mail not in a mbox' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout first &&
	git am patch1.eml &&
	! test -d .git/rebase-apply &&
	git diff --exit-code second &&
	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
'

test_expect_success 'am applies patch e-mail not in a mbox with CRLF' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout first &&
	git am patch1-crlf.eml &&
	! test -d .git/rebase-apply &&
	git diff --exit-code second &&
	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
'

test_expect_success 'setup: new author and committer' '
	GIT_AUTHOR_NAME="Another Thor" &&
	GIT_AUTHOR_EMAIL="a.thor@example.com" &&
	GIT_COMMITTER_NAME="Co M Miter" &&
	GIT_COMMITTER_EMAIL="c.miter@example.com" &&
	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
'

compare () {
	a=$(git cat-file commit "$2" | grep "^$1 ") &&
	b=$(git cat-file commit "$3" | grep "^$1 ") &&
	test "$a" = "$b"
}

test_expect_success 'am changes committer and keeps author' '
	test_tick &&
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout first &&
	git am patch2 &&
	! test -d .git/rebase-apply &&
	test "$(git rev-parse master^^)" = "$(git rev-parse HEAD^^)" &&
	git diff --exit-code master..HEAD &&
	git diff --exit-code master^..HEAD^ &&
	compare author master HEAD &&
	compare author master^ HEAD^ &&
	test "$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" = \
	     "$(git log -1 --pretty=format:"%cn <%ce>" HEAD)"
'

test_expect_success 'am --signoff adds Signed-off-by: line' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout -b master2 first &&
	git am --signoff <patch2 &&
	printf "%s\n" "$signoff" >expected &&
	echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" >>expected &&
	git cat-file commit HEAD^ | grep "Signed-off-by:" >actual &&
	test_cmp expected actual &&
	echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" >expected &&
	git cat-file commit HEAD | grep "Signed-off-by:" >actual &&
	test_cmp expected actual
'

test_expect_success 'am stays in branch' '
	echo refs/heads/master2 >expected &&
	git symbolic-ref HEAD >actual &&
	test_cmp expected actual
'

test_expect_success 'am --signoff does not add Signed-off-by: line if already there' '
	git format-patch --stdout HEAD^ >patch3 &&
	sed -e "/^Subject/ s,\[PATCH,Re: Re: Re: & 1/5 v2," patch3 >patch4 &&
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout HEAD^ &&
	git am --signoff patch4 &&
	git cat-file commit HEAD >actual &&
	test $(grep -c "^Signed-off-by:" actual) -eq 1
'

test_expect_success 'am without --keep removes Re: and [PATCH] stuff' '
	git rev-parse HEAD >expected &&
	git rev-parse master2 >actual &&
	test_cmp expected actual
'

test_expect_success 'am --keep really keeps the subject' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout HEAD^ &&
	git am --keep patch4 &&
	! test -d .git/rebase-apply &&
	git cat-file commit HEAD >actual &&
	grep "Re: Re: Re: \[PATCH 1/5 v2\] third" actual
'

test_expect_success 'am -3 falls back to 3-way merge' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout -b lorem2 master2 &&
	sed -n -e "3,\$p" msg >file &&
	head -n 9 msg >>file &&
	git add file &&
	test_tick &&
	git commit -m "copied stuff" &&
	git am -3 lorem-move.patch &&
	! test -d .git/rebase-apply &&
	git diff --exit-code lorem
'

test_expect_success 'am can rename a file' '
	grep "^rename from" rename.patch &&
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout lorem^0 &&
	git am rename.patch &&
	! test -d .git/rebase-apply &&
	git update-index --refresh &&
	git diff --exit-code rename
'

test_expect_success 'am -3 can rename a file' '
	grep "^rename from" rename.patch &&
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout lorem^0 &&
	git am -3 rename.patch &&
	! test -d .git/rebase-apply &&
	git update-index --refresh &&
	git diff --exit-code rename
'

test_expect_success 'am -3 can rename a file after falling back to 3-way merge' '
	grep "^rename from" rename-add.patch &&
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout lorem^0 &&
	git am -3 rename-add.patch &&
	! test -d .git/rebase-apply &&
	git update-index --refresh &&
	git diff --exit-code rename
'

test_expect_success 'am -3 -q is quiet' '
	rm -fr .git/rebase-apply &&
	git checkout -f lorem2 &&
	git reset master2 --hard &&
	sed -n -e "3,\$p" msg >file &&
	head -n 9 msg >>file &&
	git add file &&
	test_tick &&
	git commit -m "copied stuff" &&
	git am -3 -q lorem-move.patch >output.out 2>&1 &&
	! test -s output.out
'

test_expect_success 'am pauses on conflict' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout lorem2^^ &&
	test_must_fail git am lorem-move.patch &&
	test -d .git/rebase-apply
'

test_expect_success 'am --skip works' '
	echo goodbye >expected &&
	git am --skip &&
	! test -d .git/rebase-apply &&
	git diff --exit-code lorem2^^ -- file &&
	test_cmp expected another
'

test_expect_success 'am --resolved works' '
	echo goodbye >expected &&
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout lorem2^^ &&
	test_must_fail git am lorem-move.patch &&
	test -d .git/rebase-apply &&
	echo resolved >>file &&
	git add file &&
	git am --resolved &&
	! test -d .git/rebase-apply &&
	test_cmp expected another
'

test_expect_success 'am takes patches from a Pine mailbox' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout first &&
	cat pine patch1 | git am &&
	! test -d .git/rebase-apply &&
	git diff --exit-code master^..HEAD
'

test_expect_success 'am fails on mail without patch' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	test_must_fail git am <failmail &&
	git am --abort &&
	! test -d .git/rebase-apply
'

test_expect_success 'am fails on empty patch' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	echo "---" >>failmail &&
	test_must_fail git am <failmail &&
	git am --skip &&
	! test -d .git/rebase-apply
'

test_expect_success 'am works from stdin in subdirectory' '
	rm -fr subdir &&
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout first &&
	(
		mkdir -p subdir &&
		cd subdir &&
		git am <../patch1
	) &&
	git diff --exit-code second
'

test_expect_success 'am works from file (relative path given) in subdirectory' '
	rm -fr subdir &&
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout first &&
	(
		mkdir -p subdir &&
		cd subdir &&
		git am ../patch1
	) &&
	git diff --exit-code second
'

test_expect_success 'am works from file (absolute path given) in subdirectory' '
	rm -fr subdir &&
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout first &&
	P=$(pwd) &&
	(
		mkdir -p subdir &&
		cd subdir &&
		git am "$P/patch1"
	) &&
	git diff --exit-code second
'

test_expect_success 'am --committer-date-is-author-date' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout first &&
	test_tick &&
	git am --committer-date-is-author-date patch1 &&
	git cat-file commit HEAD | sed -e "/^\$/q" >head1 &&
	sed -ne "/^author /s/.*> //p" head1 >at &&
	sed -ne "/^committer /s/.*> //p" head1 >ct &&
	test_cmp at ct
'

test_expect_success 'am without --committer-date-is-author-date' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout first &&
	test_tick &&
	git am patch1 &&
	git cat-file commit HEAD | sed -e "/^\$/q" >head1 &&
	sed -ne "/^author /s/.*> //p" head1 >at &&
	sed -ne "/^committer /s/.*> //p" head1 >ct &&
	! test_cmp at ct
'

# This checks for +0000 because TZ is set to UTC and that should
# show up when the current time is used. The date in message is set
# by test_tick that uses -0700 timezone; if this feature does not
# work, we will see that instead of +0000.
test_expect_success 'am --ignore-date' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout first &&
	test_tick &&
	git am --ignore-date patch1 &&
	git cat-file commit HEAD | sed -e "/^\$/q" >head1 &&
	sed -ne "/^author /s/.*> //p" head1 >at &&
	grep "+0000" at
'

test_expect_success 'am into an unborn branch' '
	git rev-parse first^{tree} >expected &&
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	rm -fr subdir &&
	mkdir subdir &&
	git format-patch --numbered-files -o subdir -1 first &&
	(
		cd subdir &&
		git init &&
		git am 1
	) &&
	(
		cd subdir &&
		git rev-parse HEAD^{tree} >../actual
	) &&
	test_cmp expected actual
'

test_expect_success 'am newline in subject' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout first &&
	test_tick &&
	sed -e "s/second/second \\\n foo/" patch1 >patchnl &&
	git am <patchnl >output.out 2>&1 &&
	grep "^Applying: second \\\n foo$" output.out
'

test_expect_success 'am -q is quiet' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout first &&
	test_tick &&
	git am -q <patch1 >output.out 2>&1 &&
	! test -s output.out
'

test_done
Commit	Line	Data
d3a7b8f5 SB	1	#!/bin/sh
	2
	3	test_description='git am running'
	4
	5	. ./test-lib.sh
	6
800f1104 JN	7	test_expect_success 'setup: messages' '
	8	cat >msg <<-\EOF &&
	9	second
	10
	11	Lorem ipsum dolor sit amet, consectetuer sadipscing elitr, sed diam nonumy
	12	eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
	13	voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita
	14	kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem
	15	ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
	16	tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
	17	vero eos et accusam et justo duo dolores et ea rebum.
	18
	19	EOF
	20	q_to_tab <<-\EOF >>msg &&
	21	QDuis autem vel eum iriure dolor in hendrerit in vulputate velit
	22	Qesse molestie consequat, vel illum dolore eu feugiat nulla facilisis
	23	Qat vero eros et accumsan et iusto odio dignissim qui blandit
	24	Qpraesent luptatum zzril delenit augue duis dolore te feugait nulla
	25	Qfacilisi.
	26	EOF
	27	cat >>msg <<-\EOF &&
	28
	29	Lorem ipsum dolor sit amet,
	30	consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut
	31	laoreet dolore magna aliquam erat volutpat.
	32
	33	git
	34	---
	35	+++
	36
	37	Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit
	38	lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure
	39	dolor in hendrerit in vulputate velit esse molestie consequat, vel illum
	40	dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio
	41	dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te
	42	feugait nulla facilisi.
	43	EOF
	44
	45	cat >failmail <<-\EOF &&
	46	From foo@example.com Fri May 23 10:43:49 2008
	47	From: foo@example.com
	48	To: bar@example.com
	49	Subject: Re: [RFC/PATCH] git-foo.sh
	50	Date: Fri, 23 May 2008 05:23:42 +0200
	51
	52	Sometimes we have to find out that there'\''s nothing left.
	53
	54	EOF
	55
	56	cat >pine <<-\EOF &&
	57	From MAILER-DAEMON Fri May 23 10:43:49 2008
	58	Date: 23 May 2008 05:23:42 +0200
	59	From: Mail System Internal Data <MAILER-DAEMON@example.com>
	60	Subject: DON'\''T DELETE THIS MESSAGE -- FOLDER INTERNAL DATA
	61	Message-ID: <foo-0001@example.com>
	62
	63	This text is part of the internal format of your mail folder, and is not
	64	a real message. It is created automatically by the mail system software.
	65	If deleted, important folder data will be lost, and it will be re-created
	66	with the data reset to initial values.
	67
	68	EOF
	69
	70	signoff="Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
71	'
d3a7b8f5 SB	72
	73	test_expect_success setup '
	74	echo hello >file &&
	75	git add file &&
	76	test_tick &&
	77	git commit -m first &&
	78	git tag first &&
800f1104	79
d3a7b8f5 SB	80	echo world >>file &&
	81	git add file &&
	82	test_tick &&
	83	git commit -s -F msg &&
	84	git tag second &&
800f1104	85
d3a7b8f5	86	git format-patch --stdout first >patch1 &&
0fcb2caf JH	87	{
	88	echo "X-Fake-Field: Line One" &&
	89	echo "X-Fake-Field: Line Two" &&
	90	echo "X-Fake-Field: Line Three" &&
	91	git format-patch --stdout first \| sed -e "1d"
	92	} > patch1.eml &&
e3f67d30 SB	93	{
	94	echo "X-Fake-Field: Line One" &&
	95	echo "X-Fake-Field: Line Two" &&
	96	echo "X-Fake-Field: Line Three" &&
	97	git format-patch --stdout first \| sed -e "1d"
	98	} \| append_cr >patch1-crlf.eml &&
800f1104	99
d3a7b8f5 SB	100	sed -n -e "3,\$p" msg >file &&
	101	git add file &&
	102	test_tick &&
	103	git commit -m third &&
800f1104	104
d3a7b8f5	105	git format-patch --stdout first >patch2 &&
800f1104	106
d3a7b8f5 SB	107	git checkout -b lorem &&
	108	sed -n -e "11,\$p" msg >file &&
	109	head -n 9 msg >>file &&
	110	test_tick &&
	111	git commit -a -m "moved stuff" &&
800f1104	112
d3a7b8f5 SB	113	echo goodbye >another &&
	114	git add another &&
	115	test_tick &&
	116	git commit -m "added another file" &&
d3a7b8f5	117
800f1104	118	git format-patch --stdout master >lorem-move.patch &&
18cdf802 JH	119
	120	git checkout -b rename &&
	121	git mv file renamed &&
	122	git commit -m "renamed a file" &&
	123
	124	git format-patch -M --stdout lorem >rename.patch &&
	125
	126	git reset --soft lorem^ &&
	127	git commit -m "renamed a file and added another" &&
	128
	129	git format-patch -M --stdout lorem^ >rename-add.patch &&
	130
800f1104 JN	131	# reset time
	132	unset test_tick &&
	133	test_tick
	134	'
d3a7b8f5 SB	135
d3a7b8f5 SB	136	test_expect_success 'am applies patch correctly' '
5d274859 JN	137	rm -fr .git/rebase-apply &&
5d274859 JN	138	git reset --hard &&
d3a7b8f5 SB	139	git checkout first &&
	140	test_tick &&
	141	git am <patch1 &&
51ef1daa	142	! test -d .git/rebase-apply &&
800f1104	143	git diff --exit-code second &&
d3a7b8f5 SB	144	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
d3a7b8f5 SB	145	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
0fcb2caf JH	146	'
	147
	148	test_expect_success 'am applies patch e-mail not in a mbox' '
5d274859 JN	149	rm -fr .git/rebase-apply &&
5d274859 JN	150	git reset --hard &&
0fcb2caf JH	151	git checkout first &&
	152	git am patch1.eml &&
	153	! test -d .git/rebase-apply &&
800f1104	154	git diff --exit-code second &&
0fcb2caf JH	155	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
0fcb2caf JH	156	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
e3f67d30 SB	157	'
	158
	159	test_expect_success 'am applies patch e-mail not in a mbox with CRLF' '
5d274859 JN	160	rm -fr .git/rebase-apply &&
5d274859 JN	161	git reset --hard &&
e3f67d30 SB	162	git checkout first &&
	163	git am patch1-crlf.eml &&
	164	! test -d .git/rebase-apply &&
800f1104	165	git diff --exit-code second &&
e3f67d30 SB	166	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
e3f67d30 SB	167	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
d3a7b8f5 SB	168	'
d3a7b8f5 SB	169
800f1104 JN	170	test_expect_success 'setup: new author and committer' '
	171	GIT_AUTHOR_NAME="Another Thor" &&
	172	GIT_AUTHOR_EMAIL="a.thor@example.com" &&
	173	GIT_COMMITTER_NAME="Co M Miter" &&
	174	GIT_COMMITTER_EMAIL="c.miter@example.com" &&
	175	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
	176	'
d3a7b8f5 SB	177
d3a7b8f5 SB	178	compare () {
800f1104 JN	179	a=$(git cat-file commit "$2" \| grep "^$1 ") &&
	180	b=$(git cat-file commit "$3" \| grep "^$1 ") &&
	181	test "$a" = "$b"
d3a7b8f5 SB	182	}
	183
	184	test_expect_success 'am changes committer and keeps author' '
	185	test_tick &&
5d274859 JN	186	rm -fr .git/rebase-apply &&
5d274859 JN	187	git reset --hard &&
d3a7b8f5 SB	188	git checkout first &&
d3a7b8f5 SB	189	git am patch2 &&
51ef1daa	190	! test -d .git/rebase-apply &&
d3a7b8f5	191	test "$(git rev-parse master^^)" = "$(git rev-parse HEAD^^)" &&
800f1104 JN	192	git diff --exit-code master..HEAD &&
800f1104 JN	193	git diff --exit-code master^..HEAD^ &&
d3a7b8f5 SB	194	compare author master HEAD &&
	195	compare author master^ HEAD^ &&
	196	test "$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" = \
	197	"$(git log -1 --pretty=format:"%cn <%ce>" HEAD)"
	198	'
	199
	200	test_expect_success 'am --signoff adds Signed-off-by: line' '
5d274859 JN	201	rm -fr .git/rebase-apply &&
5d274859 JN	202	git reset --hard &&
d3a7b8f5 SB	203	git checkout -b master2 first &&
d3a7b8f5 SB	204	git am --signoff <patch2 &&
800f1104	205	printf "%s\n" "$signoff" >expected &&
d3a7b8f5 SB	206	echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" >>expected &&
d3a7b8f5 SB	207	git cat-file commit HEAD^ \| grep "Signed-off-by:" >actual &&
800f1104	208	test_cmp expected actual &&
d3a7b8f5 SB	209	echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" >expected &&
d3a7b8f5 SB	210	git cat-file commit HEAD \| grep "Signed-off-by:" >actual &&
800f1104	211	test_cmp expected actual
d3a7b8f5 SB	212	'
	213
	214	test_expect_success 'am stays in branch' '
800f1104 JN	215	echo refs/heads/master2 >expected &&
	216	git symbolic-ref HEAD >actual &&
	217	test_cmp expected actual
d3a7b8f5 SB	218	'
	219
	220	test_expect_success 'am --signoff does not add Signed-off-by: line if already there' '
	221	git format-patch --stdout HEAD^ >patch3 &&
a48fcd83	222	sed -e "/^Subject/ s,\[PATCH,Re: Re: Re: & 1/5 v2," patch3 >patch4 &&
5d274859 JN	223	rm -fr .git/rebase-apply &&
5d274859 JN	224	git reset --hard &&
d3a7b8f5 SB	225	git checkout HEAD^ &&
d3a7b8f5 SB	226	git am --signoff patch4 &&
800f1104 JN	227	git cat-file commit HEAD >actual &&
800f1104 JN	228	test $(grep -c "^Signed-off-by:" actual) -eq 1
d3a7b8f5 SB	229	'
	230
	231	test_expect_success 'am without --keep removes Re: and [PATCH] stuff' '
800f1104 JN	232	git rev-parse HEAD >expected &&
	233	git rev-parse master2 >actual &&
	234	test_cmp expected actual
d3a7b8f5 SB	235	'
	236
	237	test_expect_success 'am --keep really keeps the subject' '
5d274859 JN	238	rm -fr .git/rebase-apply &&
5d274859 JN	239	git reset --hard &&
d3a7b8f5 SB	240	git checkout HEAD^ &&
d3a7b8f5 SB	241	git am --keep patch4 &&
51ef1daa	242	! test -d .git/rebase-apply &&
800f1104 JN	243	git cat-file commit HEAD >actual &&
800f1104 JN	244	grep "Re: Re: Re: \[PATCH 1/5 v2\] third" actual
d3a7b8f5 SB	245	'
	246
	247	test_expect_success 'am -3 falls back to 3-way merge' '
5d274859 JN	248	rm -fr .git/rebase-apply &&
5d274859 JN	249	git reset --hard &&
d3a7b8f5 SB	250	git checkout -b lorem2 master2 &&
	251	sed -n -e "3,\$p" msg >file &&
	252	head -n 9 msg >>file &&
	253	git add file &&
	254	test_tick &&
	255	git commit -m "copied stuff" &&
	256	git am -3 lorem-move.patch &&
51ef1daa	257	! test -d .git/rebase-apply &&
800f1104	258	git diff --exit-code lorem
d3a7b8f5 SB	259	'
d3a7b8f5 SB	260
18cdf802 JH	261	test_expect_success 'am can rename a file' '
	262	grep "^rename from" rename.patch &&
	263	rm -fr .git/rebase-apply &&
	264	git reset --hard &&
	265	git checkout lorem^0 &&
	266	git am rename.patch &&
	267	! test -d .git/rebase-apply &&
	268	git update-index --refresh &&
	269	git diff --exit-code rename
	270	'
	271
	272	test_expect_success 'am -3 can rename a file' '
	273	grep "^rename from" rename.patch &&
	274	rm -fr .git/rebase-apply &&
	275	git reset --hard &&
	276	git checkout lorem^0 &&
	277	git am -3 rename.patch &&
	278	! test -d .git/rebase-apply &&
	279	git update-index --refresh &&
	280	git diff --exit-code rename
	281	'
	282
	283	test_expect_success 'am -3 can rename a file after falling back to 3-way merge' '
	284	grep "^rename from" rename-add.patch &&
	285	rm -fr .git/rebase-apply &&
	286	git reset --hard &&
	287	git checkout lorem^0 &&
	288	git am -3 rename-add.patch &&
	289	! test -d .git/rebase-apply &&
	290	git update-index --refresh &&
	291	git diff --exit-code rename
	292	'
	293
0e987a12	294	test_expect_success 'am -3 -q is quiet' '
5d274859	295	rm -fr .git/rebase-apply &&
18cdf802	296	git checkout -f lorem2 &&
0e987a12 SB	297	git reset master2 --hard &&
	298	sed -n -e "3,\$p" msg >file &&
	299	head -n 9 msg >>file &&
	300	git add file &&
	301	test_tick &&
	302	git commit -m "copied stuff" &&
800f1104	303	git am -3 -q lorem-move.patch >output.out 2>&1 &&
0e987a12 SB	304	! test -s output.out
	305	'
	306
d3a7b8f5	307	test_expect_success 'am pauses on conflict' '
5d274859 JN	308	rm -fr .git/rebase-apply &&
5d274859 JN	309	git reset --hard &&
d3a7b8f5	310	git checkout lorem2^^ &&
d492b31c	311	test_must_fail git am lorem-move.patch &&
51ef1daa	312	test -d .git/rebase-apply
d3a7b8f5 SB	313	'
	314
	315	test_expect_success 'am --skip works' '
800f1104	316	echo goodbye >expected &&
d3a7b8f5	317	git am --skip &&
51ef1daa	318	! test -d .git/rebase-apply &&
800f1104 JN	319	git diff --exit-code lorem2^^ -- file &&
800f1104 JN	320	test_cmp expected another
d3a7b8f5 SB	321	'
	322
	323	test_expect_success 'am --resolved works' '
800f1104	324	echo goodbye >expected &&
5d274859 JN	325	rm -fr .git/rebase-apply &&
5d274859 JN	326	git reset --hard &&
d3a7b8f5	327	git checkout lorem2^^ &&
d492b31c	328	test_must_fail git am lorem-move.patch &&
51ef1daa	329	test -d .git/rebase-apply &&
d3a7b8f5 SB	330	echo resolved >>file &&
	331	git add file &&
	332	git am --resolved &&
51ef1daa	333	! test -d .git/rebase-apply &&
800f1104	334	test_cmp expected another
d3a7b8f5 SB	335	'
	336
	337	test_expect_success 'am takes patches from a Pine mailbox' '
5d274859 JN	338	rm -fr .git/rebase-apply &&
5d274859 JN	339	git reset --hard &&
d3a7b8f5 SB	340	git checkout first &&
d3a7b8f5 SB	341	cat pine patch1 \| git am &&
51ef1daa	342	! test -d .git/rebase-apply &&
800f1104	343	git diff --exit-code master^..HEAD
d3a7b8f5 SB	344	'
	345
	346	test_expect_success 'am fails on mail without patch' '
5d274859 JN	347	rm -fr .git/rebase-apply &&
5d274859 JN	348	git reset --hard &&
d492b31c	349	test_must_fail git am <failmail &&
5d274859 JN	350	git am --abort &&
5d274859 JN	351	! test -d .git/rebase-apply
d3a7b8f5 SB	352	'
	353
	354	test_expect_success 'am fails on empty patch' '
5d274859 JN	355	rm -fr .git/rebase-apply &&
5d274859 JN	356	git reset --hard &&
d3a7b8f5	357	echo "---" >>failmail &&
d492b31c	358	test_must_fail git am <failmail &&
d3a7b8f5	359	git am --skip &&
51ef1daa	360	! test -d .git/rebase-apply
d3a7b8f5 SB	361	'
d3a7b8f5 SB	362
8ec00d05 SB	363	test_expect_success 'am works from stdin in subdirectory' '
8ec00d05 SB	364	rm -fr subdir &&
5d274859 JN	365	rm -fr .git/rebase-apply &&
5d274859 JN	366	git reset --hard &&
8ec00d05 SB	367	git checkout first &&
	368	(
	369	mkdir -p subdir &&
	370	cd subdir &&
	371	git am <../patch1
	372	) &&
800f1104	373	git diff --exit-code second
8ec00d05 SB	374	'
	375
	376	test_expect_success 'am works from file (relative path given) in subdirectory' '
	377	rm -fr subdir &&
5d274859 JN	378	rm -fr .git/rebase-apply &&
5d274859 JN	379	git reset --hard &&
8ec00d05 SB	380	git checkout first &&
	381	(
	382	mkdir -p subdir &&
	383	cd subdir &&
	384	git am ../patch1
	385	) &&
800f1104	386	git diff --exit-code second
8ec00d05 SB	387	'
	388
	389	test_expect_success 'am works from file (absolute path given) in subdirectory' '
	390	rm -fr subdir &&
5d274859 JN	391	rm -fr .git/rebase-apply &&
5d274859 JN	392	git reset --hard &&
8ec00d05 SB	393	git checkout first &&
	394	P=$(pwd) &&
	395	(
	396	mkdir -p subdir &&
	397	cd subdir &&
	398	git am "$P/patch1"
	399	) &&
800f1104	400	git diff --exit-code second
8ec00d05 SB	401	'
8ec00d05 SB	402
3f01ad66	403	test_expect_success 'am --committer-date-is-author-date' '
5d274859 JN	404	rm -fr .git/rebase-apply &&
5d274859 JN	405	git reset --hard &&
3f01ad66 JH	406	git checkout first &&
	407	test_tick &&
	408	git am --committer-date-is-author-date patch1 &&
9524cf29	409	git cat-file commit HEAD \| sed -e "/^\$/q" >head1 &&
800f1104 JN	410	sed -ne "/^author /s/.*> //p" head1 >at &&
	411	sed -ne "/^committer /s/.*> //p" head1 >ct &&
	412	test_cmp at ct
3f01ad66 JH	413	'
	414
	415	test_expect_success 'am without --committer-date-is-author-date' '
5d274859 JN	416	rm -fr .git/rebase-apply &&
5d274859 JN	417	git reset --hard &&
3f01ad66 JH	418	git checkout first &&
	419	test_tick &&
	420	git am patch1 &&
9524cf29	421	git cat-file commit HEAD \| sed -e "/^\$/q" >head1 &&
800f1104 JN	422	sed -ne "/^author /s/.*> //p" head1 >at &&
	423	sed -ne "/^committer /s/.*> //p" head1 >ct &&
	424	! test_cmp at ct
3f01ad66 JH	425	'
3f01ad66 JH	426
a79ec62d NS	427	# This checks for +0000 because TZ is set to UTC and that should
	428	# show up when the current time is used. The date in message is set
	429	# by test_tick that uses -0700 timezone; if this feature does not
	430	# work, we will see that instead of +0000.
	431	test_expect_success 'am --ignore-date' '
5d274859 JN	432	rm -fr .git/rebase-apply &&
5d274859 JN	433	git reset --hard &&
a79ec62d NS	434	git checkout first &&
	435	test_tick &&
	436	git am --ignore-date patch1 &&
9524cf29	437	git cat-file commit HEAD \| sed -e "/^\$/q" >head1 &&
800f1104 JN	438	sed -ne "/^author /s/.*> //p" head1 >at &&
800f1104 JN	439	grep "+0000" at
a79ec62d NS	440	'
a79ec62d NS	441
f79d4c8a	442	test_expect_success 'am into an unborn branch' '
800f1104	443	git rev-parse first^{tree} >expected &&
5d274859 JN	444	rm -fr .git/rebase-apply &&
5d274859 JN	445	git reset --hard &&
f79d4c8a	446	rm -fr subdir &&
800f1104	447	mkdir subdir &&
f79d4c8a NS	448	git format-patch --numbered-files -o subdir -1 first &&
	449	(
	450	cd subdir &&
	451	git init &&
	452	git am 1
	453	) &&
800f1104 JN	454	(
	455	cd subdir &&
	456	git rev-parse HEAD^{tree} >../actual
f79d4c8a	457	) &&
800f1104	458	test_cmp expected actual
f79d4c8a NS	459	'
f79d4c8a NS	460
b3c32ead	461	test_expect_success 'am newline in subject' '
5d274859 JN	462	rm -fr .git/rebase-apply &&
5d274859 JN	463	git reset --hard &&
b3c32ead SB	464	git checkout first &&
b3c32ead SB	465	test_tick &&
800f1104 JN	466	sed -e "s/second/second \\\n foo/" patch1 >patchnl &&
800f1104 JN	467	git am <patchnl >output.out 2>&1 &&
b3c32ead SB	468	grep "^Applying: second \\\n foo$" output.out
	469	'
	470
0e987a12	471	test_expect_success 'am -q is quiet' '
5d274859 JN	472	rm -fr .git/rebase-apply &&
5d274859 JN	473	git reset --hard &&
0e987a12 SB	474	git checkout first &&
0e987a12 SB	475	test_tick &&
800f1104	476	git am -q <patch1 >output.out 2>&1 &&
0e987a12 SB	477	! test -s output.out
	478	'
	479
d3a7b8f5	480	test_done