[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
	qz_to_tab_space <<-\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 "Message-Id: <1226501681-24923-1-git-send-email-bda@mnsspb.ru>" &&
		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 &&
	{
		printf "%255s\\n" ""
		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-ws.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 format-patch --no-prefix --stdout master >lorem-zero.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
	sane_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_path_is_missing .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_path_is_missing .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_path_is_missing .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 with preceding whitespace' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout first &&
	git am patch1-ws.eml &&
	test_path_is_missing .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_path_is_missing .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] [foo," 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_path_is_missing .git/rebase-apply &&
	git cat-file commit HEAD >actual &&
	grep "Re: Re: Re: \[PATCH 1/5 v2\] \[foo\] third" actual
'

test_expect_success 'am --keep-non-patch really keeps the non-patch part' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout HEAD^ &&
	git am --keep-non-patch patch4 &&
	test_path_is_missing .git/rebase-apply &&
	git cat-file commit HEAD >actual &&
	grep "^\[foo\] 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_path_is_missing .git/rebase-apply &&
	git diff --exit-code lorem
'

test_expect_success 'am -3 -p0 can read --no-prefix patch' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout -b lorem3 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 -p0 lorem-zero.patch &&
	test_path_is_missing .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_path_is_missing .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_path_is_missing .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_path_is_missing .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_path_is_missing .git/rebase-apply &&
	git diff --exit-code lorem2^^ -- file &&
	test_cmp expected another
'

test_expect_success 'am --abort removes a stray directory' '
	mkdir .git/rebase-apply &&
	git am --abort &&
	test_path_is_missing .git/rebase-apply
'

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_path_is_missing .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_path_is_missing .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_path_is_missing .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_path_is_missing .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 &&
	test_i18ngrep "^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_expect_success 'am empty-file does not infloop' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	touch empty-file &&
	test_tick &&
	test_must_fail git am empty-file 2>actual &&
	echo Patch format detection failed. >expected &&
	test_i18ncmp expected actual
'

test_expect_success 'am --message-id really adds the message id' '
	rm -fr .git/rebase-apply &&
	git reset --hard &&
	git checkout HEAD^ &&
	git am --message-id 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 &&
	git checkout HEAD^ &&
	git am -s --message-id patch1.eml &&
	test_path_is_missing .git/rebase-apply &&
	git cat-file commit HEAD | tail -n2 | head -n1 >actual &&
	grep Message-Id patch1.eml >expected &&
	test_cmp expected actual
'

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
250b3c6c	20	qz_to_tab_space <<-\EOF >>msg &&
800f1104 JN	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	87	{
a078f732	88	echo "Message-Id: <1226501681-24923-1-git-send-email-bda@mnsspb.ru>" &&
0fcb2caf JH	89	echo "X-Fake-Field: Line One" &&
	90	echo "X-Fake-Field: Line Two" &&
	91	echo "X-Fake-Field: Line Three" &&
	92	git format-patch --stdout first \| sed -e "1d"
	93	} > patch1.eml &&
e3f67d30 SB	94	{
	95	echo "X-Fake-Field: Line One" &&
	96	echo "X-Fake-Field: Line Two" &&
	97	echo "X-Fake-Field: Line Three" &&
	98	git format-patch --stdout first \| sed -e "1d"
	99	} \| append_cr >patch1-crlf.eml &&
0e8341f2 DB	100	{
	101	printf "%255s\\n" ""
	102	echo "X-Fake-Field: Line One" &&
	103	echo "X-Fake-Field: Line Two" &&
	104	echo "X-Fake-Field: Line Three" &&
	105	git format-patch --stdout first \| sed -e "1d"
	106	} > patch1-ws.eml &&
800f1104	107
d3a7b8f5 SB	108	sed -n -e "3,\$p" msg >file &&
	109	git add file &&
	110	test_tick &&
	111	git commit -m third &&
800f1104	112
d3a7b8f5	113	git format-patch --stdout first >patch2 &&
800f1104	114
d3a7b8f5 SB	115	git checkout -b lorem &&
	116	sed -n -e "11,\$p" msg >file &&
	117	head -n 9 msg >>file &&
	118	test_tick &&
	119	git commit -a -m "moved stuff" &&
800f1104	120
d3a7b8f5 SB	121	echo goodbye >another &&
	122	git add another &&
	123	test_tick &&
	124	git commit -m "added another file" &&
d3a7b8f5	125
800f1104	126	git format-patch --stdout master >lorem-move.patch &&
a61ba26a	127	git format-patch --no-prefix --stdout master >lorem-zero.patch &&
18cdf802 JH	128
	129	git checkout -b rename &&
	130	git mv file renamed &&
	131	git commit -m "renamed a file" &&
	132
	133	git format-patch -M --stdout lorem >rename.patch &&
	134
	135	git reset --soft lorem^ &&
	136	git commit -m "renamed a file and added another" &&
	137
	138	git format-patch -M --stdout lorem^ >rename-add.patch &&
	139
800f1104	140	# reset time
1f5ad6b1	141	sane_unset test_tick &&
800f1104 JN	142	test_tick
800f1104 JN	143	'
d3a7b8f5 SB	144
d3a7b8f5 SB	145	test_expect_success 'am applies patch correctly' '
5d274859 JN	146	rm -fr .git/rebase-apply &&
5d274859 JN	147	git reset --hard &&
d3a7b8f5 SB	148	git checkout first &&
	149	test_tick &&
	150	git am <patch1 &&
61e0eb9d	151	test_path_is_missing .git/rebase-apply &&
800f1104	152	git diff --exit-code second &&
d3a7b8f5 SB	153	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
d3a7b8f5 SB	154	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
0fcb2caf JH	155	'
	156
	157	test_expect_success 'am applies patch e-mail not in a mbox' '
5d274859 JN	158	rm -fr .git/rebase-apply &&
5d274859 JN	159	git reset --hard &&
0fcb2caf JH	160	git checkout first &&
0fcb2caf JH	161	git am patch1.eml &&
61e0eb9d	162	test_path_is_missing .git/rebase-apply &&
800f1104	163	git diff --exit-code second &&
0fcb2caf JH	164	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
0fcb2caf JH	165	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
e3f67d30 SB	166	'
	167
	168	test_expect_success 'am applies patch e-mail not in a mbox with CRLF' '
5d274859 JN	169	rm -fr .git/rebase-apply &&
5d274859 JN	170	git reset --hard &&
e3f67d30 SB	171	git checkout first &&
e3f67d30 SB	172	git am patch1-crlf.eml &&
61e0eb9d	173	test_path_is_missing .git/rebase-apply &&
800f1104	174	git diff --exit-code second &&
e3f67d30 SB	175	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
e3f67d30 SB	176	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
d3a7b8f5 SB	177	'
d3a7b8f5 SB	178
0e8341f2 DB	179	test_expect_success 'am applies patch e-mail with preceding whitespace' '
	180	rm -fr .git/rebase-apply &&
	181	git reset --hard &&
	182	git checkout first &&
	183	git am patch1-ws.eml &&
61e0eb9d	184	test_path_is_missing .git/rebase-apply &&
0e8341f2 DB	185	git diff --exit-code second &&
	186	test "$(git rev-parse second)" = "$(git rev-parse HEAD)" &&
	187	test "$(git rev-parse second^)" = "$(git rev-parse HEAD^)"
	188	'
	189
800f1104 JN	190	test_expect_success 'setup: new author and committer' '
	191	GIT_AUTHOR_NAME="Another Thor" &&
	192	GIT_AUTHOR_EMAIL="a.thor@example.com" &&
	193	GIT_COMMITTER_NAME="Co M Miter" &&
	194	GIT_COMMITTER_EMAIL="c.miter@example.com" &&
	195	export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
	196	'
d3a7b8f5 SB	197
d3a7b8f5 SB	198	compare () {
800f1104 JN	199	a=$(git cat-file commit "$2" \| grep "^$1 ") &&
	200	b=$(git cat-file commit "$3" \| grep "^$1 ") &&
	201	test "$a" = "$b"
d3a7b8f5 SB	202	}
	203
	204	test_expect_success 'am changes committer and keeps author' '
	205	test_tick &&
5d274859 JN	206	rm -fr .git/rebase-apply &&
5d274859 JN	207	git reset --hard &&
d3a7b8f5 SB	208	git checkout first &&
d3a7b8f5 SB	209	git am patch2 &&
61e0eb9d	210	test_path_is_missing .git/rebase-apply &&
d3a7b8f5	211	test "$(git rev-parse master^^)" = "$(git rev-parse HEAD^^)" &&
800f1104 JN	212	git diff --exit-code master..HEAD &&
800f1104 JN	213	git diff --exit-code master^..HEAD^ &&
d3a7b8f5 SB	214	compare author master HEAD &&
	215	compare author master^ HEAD^ &&
	216	test "$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" = \
	217	"$(git log -1 --pretty=format:"%cn <%ce>" HEAD)"
	218	'
	219
	220	test_expect_success 'am --signoff adds Signed-off-by: line' '
5d274859 JN	221	rm -fr .git/rebase-apply &&
5d274859 JN	222	git reset --hard &&
d3a7b8f5 SB	223	git checkout -b master2 first &&
d3a7b8f5 SB	224	git am --signoff <patch2 &&
800f1104	225	printf "%s\n" "$signoff" >expected &&
d3a7b8f5 SB	226	echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" >>expected &&
d3a7b8f5 SB	227	git cat-file commit HEAD^ \| grep "Signed-off-by:" >actual &&
800f1104	228	test_cmp expected actual &&
d3a7b8f5 SB	229	echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" >expected &&
d3a7b8f5 SB	230	git cat-file commit HEAD \| grep "Signed-off-by:" >actual &&
800f1104	231	test_cmp expected actual
d3a7b8f5 SB	232	'
	233
	234	test_expect_success 'am stays in branch' '
800f1104 JN	235	echo refs/heads/master2 >expected &&
	236	git symbolic-ref HEAD >actual &&
	237	test_cmp expected actual
d3a7b8f5 SB	238	'
	239
	240	test_expect_success 'am --signoff does not add Signed-off-by: line if already there' '
	241	git format-patch --stdout HEAD^ >patch3 &&
f7e5ea17	242	sed -e "/^Subject/ s,\[PATCH,Re: Re: Re: & 1/5 v2] [foo," patch3 >patch4 &&
5d274859 JN	243	rm -fr .git/rebase-apply &&
5d274859 JN	244	git reset --hard &&
d3a7b8f5 SB	245	git checkout HEAD^ &&
d3a7b8f5 SB	246	git am --signoff patch4 &&
800f1104 JN	247	git cat-file commit HEAD >actual &&
800f1104 JN	248	test $(grep -c "^Signed-off-by:" actual) -eq 1
d3a7b8f5 SB	249	'
	250
	251	test_expect_success 'am without --keep removes Re: and [PATCH] stuff' '
800f1104 JN	252	git rev-parse HEAD >expected &&
	253	git rev-parse master2 >actual &&
	254	test_cmp expected actual
d3a7b8f5 SB	255	'
	256
	257	test_expect_success 'am --keep really keeps the subject' '
5d274859 JN	258	rm -fr .git/rebase-apply &&
5d274859 JN	259	git reset --hard &&
d3a7b8f5 SB	260	git checkout HEAD^ &&
d3a7b8f5 SB	261	git am --keep patch4 &&
61e0eb9d	262	test_path_is_missing .git/rebase-apply &&
800f1104	263	git cat-file commit HEAD >actual &&
f7e5ea17 TR	264	grep "Re: Re: Re: \[PATCH 1/5 v2\] \[foo\] third" actual
	265	'
	266
ee2d1cb4	267	test_expect_success 'am --keep-non-patch really keeps the non-patch part' '
f7e5ea17 TR	268	rm -fr .git/rebase-apply &&
	269	git reset --hard &&
	270	git checkout HEAD^ &&
	271	git am --keep-non-patch patch4 &&
61e0eb9d	272	test_path_is_missing .git/rebase-apply &&
f7e5ea17 TR	273	git cat-file commit HEAD >actual &&
f7e5ea17 TR	274	grep "^\[foo\] third" actual
d3a7b8f5 SB	275	'
	276
	277	test_expect_success 'am -3 falls back to 3-way merge' '
5d274859 JN	278	rm -fr .git/rebase-apply &&
5d274859 JN	279	git reset --hard &&
d3a7b8f5 SB	280	git checkout -b lorem2 master2 &&
	281	sed -n -e "3,\$p" msg >file &&
	282	head -n 9 msg >>file &&
	283	git add file &&
	284	test_tick &&
	285	git commit -m "copied stuff" &&
	286	git am -3 lorem-move.patch &&
61e0eb9d	287	test_path_is_missing .git/rebase-apply &&
800f1104	288	git diff --exit-code lorem
d3a7b8f5 SB	289	'
d3a7b8f5 SB	290
a61ba26a JH	291	test_expect_success 'am -3 -p0 can read --no-prefix patch' '
	292	rm -fr .git/rebase-apply &&
	293	git reset --hard &&
	294	git checkout -b lorem3 master2 &&
	295	sed -n -e "3,\$p" msg >file &&
	296	head -n 9 msg >>file &&
	297	git add file &&
	298	test_tick &&
	299	git commit -m "copied stuff" &&
	300	git am -3 -p0 lorem-zero.patch &&
61e0eb9d	301	test_path_is_missing .git/rebase-apply &&
a61ba26a JH	302	git diff --exit-code lorem
	303	'
	304
18cdf802 JH	305	test_expect_success 'am can rename a file' '
	306	grep "^rename from" rename.patch &&
	307	rm -fr .git/rebase-apply &&
	308	git reset --hard &&
	309	git checkout lorem^0 &&
	310	git am rename.patch &&
61e0eb9d	311	test_path_is_missing .git/rebase-apply &&
18cdf802 JH	312	git update-index --refresh &&
	313	git diff --exit-code rename
	314	'
	315
	316	test_expect_success 'am -3 can rename a file' '
	317	grep "^rename from" rename.patch &&
	318	rm -fr .git/rebase-apply &&
	319	git reset --hard &&
	320	git checkout lorem^0 &&
	321	git am -3 rename.patch &&
61e0eb9d	322	test_path_is_missing .git/rebase-apply &&
18cdf802 JH	323	git update-index --refresh &&
	324	git diff --exit-code rename
	325	'
	326
	327	test_expect_success 'am -3 can rename a file after falling back to 3-way merge' '
	328	grep "^rename from" rename-add.patch &&
	329	rm -fr .git/rebase-apply &&
	330	git reset --hard &&
	331	git checkout lorem^0 &&
	332	git am -3 rename-add.patch &&
61e0eb9d	333	test_path_is_missing .git/rebase-apply &&
18cdf802 JH	334	git update-index --refresh &&
	335	git diff --exit-code rename
	336	'
	337
0e987a12	338	test_expect_success 'am -3 -q is quiet' '
5d274859	339	rm -fr .git/rebase-apply &&
18cdf802	340	git checkout -f lorem2 &&
0e987a12 SB	341	git reset master2 --hard &&
	342	sed -n -e "3,\$p" msg >file &&
	343	head -n 9 msg >>file &&
	344	git add file &&
	345	test_tick &&
	346	git commit -m "copied stuff" &&
800f1104	347	git am -3 -q lorem-move.patch >output.out 2>&1 &&
0e987a12 SB	348	! test -s output.out
	349	'
	350
d3a7b8f5	351	test_expect_success 'am pauses on conflict' '
5d274859 JN	352	rm -fr .git/rebase-apply &&
5d274859 JN	353	git reset --hard &&
d3a7b8f5	354	git checkout lorem2^^ &&
d492b31c	355	test_must_fail git am lorem-move.patch &&
51ef1daa	356	test -d .git/rebase-apply
d3a7b8f5 SB	357	'
	358
	359	test_expect_success 'am --skip works' '
800f1104	360	echo goodbye >expected &&
d3a7b8f5	361	git am --skip &&
61e0eb9d	362	test_path_is_missing .git/rebase-apply &&
800f1104 JN	363	git diff --exit-code lorem2^^ -- file &&
800f1104 JN	364	test_cmp expected another
d3a7b8f5 SB	365	'
d3a7b8f5 SB	366
b141f3c9 RR	367	test_expect_success 'am --abort removes a stray directory' '
	368	mkdir .git/rebase-apply &&
	369	git am --abort &&
	370	test_path_is_missing .git/rebase-apply
	371	'
	372
d3a7b8f5	373	test_expect_success 'am --resolved works' '
800f1104	374	echo goodbye >expected &&
5d274859 JN	375	rm -fr .git/rebase-apply &&
5d274859 JN	376	git reset --hard &&
d3a7b8f5	377	git checkout lorem2^^ &&
d492b31c	378	test_must_fail git am lorem-move.patch &&
51ef1daa	379	test -d .git/rebase-apply &&
d3a7b8f5 SB	380	echo resolved >>file &&
	381	git add file &&
	382	git am --resolved &&
61e0eb9d	383	test_path_is_missing .git/rebase-apply &&
800f1104	384	test_cmp expected another
d3a7b8f5 SB	385	'
	386
	387	test_expect_success 'am takes patches from a Pine mailbox' '
5d274859 JN	388	rm -fr .git/rebase-apply &&
5d274859 JN	389	git reset --hard &&
d3a7b8f5 SB	390	git checkout first &&
d3a7b8f5 SB	391	cat pine patch1 \| git am &&
61e0eb9d	392	test_path_is_missing .git/rebase-apply &&
800f1104	393	git diff --exit-code master^..HEAD
d3a7b8f5 SB	394	'
	395
	396	test_expect_success 'am fails on mail without patch' '
5d274859 JN	397	rm -fr .git/rebase-apply &&
5d274859 JN	398	git reset --hard &&
d492b31c	399	test_must_fail git am <failmail &&
5d274859	400	git am --abort &&
61e0eb9d	401	test_path_is_missing .git/rebase-apply
d3a7b8f5 SB	402	'
	403
	404	test_expect_success 'am fails on empty patch' '
5d274859 JN	405	rm -fr .git/rebase-apply &&
5d274859 JN	406	git reset --hard &&
d3a7b8f5	407	echo "---" >>failmail &&
d492b31c	408	test_must_fail git am <failmail &&
d3a7b8f5	409	git am --skip &&
61e0eb9d	410	test_path_is_missing .git/rebase-apply
d3a7b8f5 SB	411	'
d3a7b8f5 SB	412
8ec00d05 SB	413	test_expect_success 'am works from stdin in subdirectory' '
8ec00d05 SB	414	rm -fr subdir &&
5d274859 JN	415	rm -fr .git/rebase-apply &&
5d274859 JN	416	git reset --hard &&
8ec00d05 SB	417	git checkout first &&
	418	(
	419	mkdir -p subdir &&
	420	cd subdir &&
	421	git am <../patch1
	422	) &&
800f1104	423	git diff --exit-code second
8ec00d05 SB	424	'
	425
	426	test_expect_success 'am works from file (relative path given) in subdirectory' '
	427	rm -fr subdir &&
5d274859 JN	428	rm -fr .git/rebase-apply &&
5d274859 JN	429	git reset --hard &&
8ec00d05 SB	430	git checkout first &&
	431	(
	432	mkdir -p subdir &&
	433	cd subdir &&
	434	git am ../patch1
	435	) &&
800f1104	436	git diff --exit-code second
8ec00d05 SB	437	'
	438
	439	test_expect_success 'am works from file (absolute path given) in subdirectory' '
	440	rm -fr subdir &&
5d274859 JN	441	rm -fr .git/rebase-apply &&
5d274859 JN	442	git reset --hard &&
8ec00d05 SB	443	git checkout first &&
	444	P=$(pwd) &&
	445	(
	446	mkdir -p subdir &&
	447	cd subdir &&
	448	git am "$P/patch1"
	449	) &&
800f1104	450	git diff --exit-code second
8ec00d05 SB	451	'
8ec00d05 SB	452
3f01ad66	453	test_expect_success 'am --committer-date-is-author-date' '
5d274859 JN	454	rm -fr .git/rebase-apply &&
5d274859 JN	455	git reset --hard &&
3f01ad66 JH	456	git checkout first &&
	457	test_tick &&
	458	git am --committer-date-is-author-date patch1 &&
9524cf29	459	git cat-file commit HEAD \| sed -e "/^\$/q" >head1 &&
800f1104 JN	460	sed -ne "/^author /s/.*> //p" head1 >at &&
	461	sed -ne "/^committer /s/.*> //p" head1 >ct &&
	462	test_cmp at ct
3f01ad66 JH	463	'
	464
	465	test_expect_success 'am without --committer-date-is-author-date' '
5d274859 JN	466	rm -fr .git/rebase-apply &&
5d274859 JN	467	git reset --hard &&
3f01ad66 JH	468	git checkout first &&
	469	test_tick &&
	470	git am patch1 &&
9524cf29	471	git cat-file commit HEAD \| sed -e "/^\$/q" >head1 &&
800f1104 JN	472	sed -ne "/^author /s/.*> //p" head1 >at &&
	473	sed -ne "/^committer /s/.*> //p" head1 >ct &&
	474	! test_cmp at ct
3f01ad66 JH	475	'
3f01ad66 JH	476
a79ec62d NS	477	# This checks for +0000 because TZ is set to UTC and that should
	478	# show up when the current time is used. The date in message is set
	479	# by test_tick that uses -0700 timezone; if this feature does not
	480	# work, we will see that instead of +0000.
	481	test_expect_success 'am --ignore-date' '
5d274859 JN	482	rm -fr .git/rebase-apply &&
5d274859 JN	483	git reset --hard &&
a79ec62d NS	484	git checkout first &&
	485	test_tick &&
	486	git am --ignore-date patch1 &&
9524cf29	487	git cat-file commit HEAD \| sed -e "/^\$/q" >head1 &&
800f1104 JN	488	sed -ne "/^author /s/.*> //p" head1 >at &&
800f1104 JN	489	grep "+0000" at
a79ec62d NS	490	'
a79ec62d NS	491
f79d4c8a	492	test_expect_success 'am into an unborn branch' '
800f1104	493	git rev-parse first^{tree} >expected &&
5d274859 JN	494	rm -fr .git/rebase-apply &&
5d274859 JN	495	git reset --hard &&
f79d4c8a	496	rm -fr subdir &&
800f1104	497	mkdir subdir &&
f79d4c8a NS	498	git format-patch --numbered-files -o subdir -1 first &&
	499	(
	500	cd subdir &&
	501	git init &&
	502	git am 1
	503	) &&
800f1104 JN	504	(
	505	cd subdir &&
	506	git rev-parse HEAD^{tree} >../actual
f79d4c8a	507	) &&
800f1104	508	test_cmp expected actual
f79d4c8a NS	509	'
f79d4c8a NS	510
b3c32ead	511	test_expect_success 'am newline in subject' '
5d274859 JN	512	rm -fr .git/rebase-apply &&
5d274859 JN	513	git reset --hard &&
b3c32ead SB	514	git checkout first &&
b3c32ead SB	515	test_tick &&
800f1104 JN	516	sed -e "s/second/second \\\n foo/" patch1 >patchnl &&
800f1104 JN	517	git am <patchnl >output.out 2>&1 &&
dff1a983	518	test_i18ngrep "^Applying: second \\\n foo$" output.out
b3c32ead SB	519	'
b3c32ead SB	520
0e987a12	521	test_expect_success 'am -q is quiet' '
5d274859 JN	522	rm -fr .git/rebase-apply &&
5d274859 JN	523	git reset --hard &&
0e987a12 SB	524	git checkout first &&
0e987a12 SB	525	test_tick &&
800f1104	526	git am -q <patch1 >output.out 2>&1 &&
0e987a12 SB	527	! test -s output.out
	528	'
	529
f0c5793b JM	530	test_expect_success 'am empty-file does not infloop' '
	531	rm -fr .git/rebase-apply &&
	532	git reset --hard &&
	533	touch empty-file &&
	534	test_tick &&
948065a4	535	test_must_fail git am empty-file 2>actual &&
f0c5793b	536	echo Patch format detection failed. >expected &&
b1f5b783	537	test_i18ncmp expected actual
f0c5793b JM	538	'
f0c5793b JM	539
a078f732 PB	540	test_expect_success 'am --message-id really adds the message id' '
	541	rm -fr .git/rebase-apply &&
	542	git reset --hard &&
	543	git checkout HEAD^ &&
	544	git am --message-id patch1.eml &&
	545	test_path_is_missing .git/rebase-apply &&
	546	git cat-file commit HEAD \| tail -n1 >actual &&
	547	grep Message-Id patch1.eml >expected &&
	548	test_cmp expected actual
	549	'
	550
	551	test_expect_success 'am --message-id -s signs off after the message id' '
	552	rm -fr .git/rebase-apply &&
	553	git reset --hard &&
	554	git checkout HEAD^ &&
	555	git am -s --message-id patch1.eml &&
	556	test_path_is_missing .git/rebase-apply &&
	557	git cat-file commit HEAD \| tail -n2 \| head -n1 >actual &&
	558	grep Message-Id patch1.eml >expected &&
	559	test_cmp expected actual
	560	'
	561
d3a7b8f5	562	test_done