[thirdparty/git.git] / t / t3437-rebase-fixup-options.sh

#!/bin/sh
#
# Copyright (c) 2018 Phillip Wood
#

test_description='git rebase interactive fixup options

This test checks the "fixup [-C|-c]" command of rebase interactive.
In addition to amending the contents of the commit, "fixup -C"
replaces the original commit message with the message of the fixup
commit. "fixup -c" also replaces the original message, but opens the
editor to allow the user to edit the message before committing. Similar
to the "fixup" command that works with "fixup!", "fixup -C" works with
"amend!" upon --autosquash.
'

TEST_PASSES_SANITIZE_LEAK=true
. ./test-lib.sh

. "$TEST_DIRECTORY"/lib-rebase.sh

EMPTY=""

get_author () {
	rev="$1" &&
	git log -1 --pretty=format:"%an %ae %at" "$rev"
}

test_expect_success 'setup' '
	cat >message <<-EOF &&
	amend! B
	$EMPTY
	new subject
	$EMPTY
	new
	body
	EOF

	test_commit initial &&
	test_commit A A &&
	test_commit B B &&
	get_author HEAD >expected-author &&
	ORIG_AUTHOR_NAME="$GIT_AUTHOR_NAME" &&
	ORIG_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" &&
	GIT_AUTHOR_NAME="Amend Author" &&
	GIT_AUTHOR_EMAIL="amend@example.com" &&
	test_commit "$(cat message)" A A1 A1 &&
	test_commit A2 A &&
	test_commit A3 A &&
	GIT_AUTHOR_NAME="$ORIG_AUTHOR_NAME" &&
	GIT_AUTHOR_EMAIL="$ORIG_AUTHOR_EMAIL" &&
	git checkout -b conflicts-branch A &&
	test_commit conflicts A &&

	set_fake_editor &&
	git checkout -b branch B &&
	echo B1 >B &&
	test_tick &&
	git commit --fixup=HEAD -a &&
	git tag B1 &&
	test_tick &&
	FAKE_COMMIT_AMEND="edited 1" git commit --fixup=reword:B &&
	test_tick &&
	FAKE_COMMIT_AMEND="edited 2" git commit --fixup=reword:HEAD &&
	echo B2 >B &&
	test_tick &&
	FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a &&
	git tag B2 &&
	echo B3 >B &&
	test_tick &&
	FAKE_COMMIT_AMEND="edited 3" git commit -a --fixup=amend:HEAD^ &&
	git tag B3 &&

	GIT_AUTHOR_NAME="Rebase Author" &&
	GIT_AUTHOR_EMAIL="rebase.author@example.com" &&
	GIT_COMMITTER_NAME="Rebase Committer" &&
	GIT_COMMITTER_EMAIL="rebase.committer@example.com"
'

test_expect_success 'simple fixup -C works' '
	test_when_finished "test_might_fail git rebase --abort" &&
	git checkout --detach A2 &&
	FAKE_LINES="1 fixup_-C 2" git rebase -i B &&
	test_cmp_rev HEAD^ B &&
	test_cmp_rev HEAD^{tree} A2^{tree} &&
	test_commit_message HEAD -m "A2"
'

test_expect_success 'simple fixup -c works' '
	test_when_finished "test_might_fail git rebase --abort" &&
	git checkout --detach A2 &&
	git log -1 --pretty=format:%B >expected-fixup-message &&
	test_write_lines "" "Modified A2" >>expected-fixup-message &&
	FAKE_LINES="1 fixup_-c 2" \
		FAKE_COMMIT_AMEND="Modified A2" \
		git rebase -i B &&
	test_cmp_rev HEAD^ B &&
	test_cmp_rev HEAD^{tree} A2^{tree} &&
	test_commit_message HEAD expected-fixup-message
'

test_expect_success 'fixup -C removes amend! from message' '
	test_when_finished "test_might_fail git rebase --abort" &&
	git checkout --detach A1 &&
	git log -1 --pretty=format:%b >expected-message &&
	FAKE_LINES="1 fixup_-C 2" git rebase -i A &&
	test_cmp_rev HEAD^ A &&
	test_cmp_rev HEAD^{tree} A1^{tree} &&
	test_commit_message HEAD expected-message &&
	get_author HEAD >actual-author &&
	test_cmp expected-author actual-author
'

test_expect_success 'fixup -C with conflicts gives correct message' '
	test_when_finished "test_might_fail git rebase --abort" &&
	git checkout --detach A1 &&
	git log -1 --pretty=format:%b >expected-message &&
	test_write_lines "" "edited" >>expected-message &&
	test_must_fail env FAKE_LINES="1 fixup_-C 2" git rebase -i conflicts &&
	git checkout --theirs -- A &&
	git add A &&
	FAKE_COMMIT_AMEND=edited git rebase --continue &&
	test_cmp_rev HEAD^ conflicts &&
	test_cmp_rev HEAD^{tree} A1^{tree} &&
	test_commit_message HEAD expected-message &&
	get_author HEAD >actual-author &&
	test_cmp expected-author actual-author
'

test_expect_success 'skipping fixup -C after fixup gives correct message' '
	test_when_finished "test_might_fail git rebase --abort" &&
	git checkout --detach A3 &&
	test_must_fail env FAKE_LINES="1 fixup 2 fixup_-C 4" git rebase -i A &&
	git reset --hard &&
	FAKE_COMMIT_AMEND=edited git rebase --continue &&
	test_commit_message HEAD -m "B"
'

test_expect_success 'sequence of fixup, fixup -C & squash --signoff works' '
	git checkout --detach B3 &&
	FAKE_LINES="1 fixup 2 fixup_-C 3 fixup_-C 4 squash 5 fixup_-C 6" \
		FAKE_COMMIT_AMEND=squashed \
		FAKE_MESSAGE_COPY=actual-squash-message \
		git -c commit.status=false rebase -ik --signoff A &&
	git diff-tree --exit-code --patch HEAD B3 -- &&
	test_cmp_rev HEAD^ A &&
	test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
		actual-squash-message
'

test_expect_success 'first fixup -C commented out in sequence fixup fixup -C fixup -C' '
	test_when_finished "test_might_fail git rebase --abort" &&
	git checkout --detach B2~ &&
	git log -1 --pretty=format:%b >expected-message &&
	FAKE_LINES="1 fixup 2 fixup_-C 3 fixup_-C 4" git rebase -i A &&
	test_cmp_rev HEAD^ A &&
	test_commit_message HEAD expected-message
'

test_expect_success 'multiple fixup -c opens editor once' '
	test_when_finished "test_might_fail git rebase --abort" &&
	git checkout --detach A3 &&
	git log -1 --pretty=format:%B >expected-message &&
	test_write_lines "" "Modified-A3" >>expected-message &&
	FAKE_COMMIT_AMEND="Modified-A3" \
		FAKE_LINES="1 fixup_-C 2 fixup_-c 3 fixup_-c 4" \
		EXPECT_HEADER_COUNT=4 \
		git rebase -i A &&
	test_cmp_rev HEAD^ A &&
	get_author HEAD >actual-author &&
	test_cmp expected-author actual-author &&
	test_commit_message HEAD expected-message
'

test_expect_success 'sequence squash, fixup & fixup -c gives combined message' '
	test_when_finished "test_might_fail git rebase --abort" &&
	git checkout --detach A3 &&
	FAKE_LINES="1 squash 2 fixup 3 fixup_-c 4" \
		FAKE_MESSAGE_COPY=actual-combined-message \
		git -c commit.status=false rebase -i A &&
	test_cmp "$TEST_DIRECTORY/t3437/expected-combined-message" \
		actual-combined-message &&
	test_cmp_rev HEAD^ A
'

test_expect_success 'fixup -C works upon --autosquash with amend!' '
	git checkout --detach B3 &&
	FAKE_COMMIT_AMEND=squashed \
		FAKE_MESSAGE_COPY=actual-squash-message \
		git -c commit.status=false rebase -ik --autosquash \
						--signoff A &&
	git diff-tree --exit-code --patch HEAD B3 -- &&
	test_cmp_rev HEAD^ A &&
	test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
		actual-squash-message
'

test_expect_success 'fixup -[Cc]<commit> works' '
	test_when_finished "test_might_fail git rebase --abort" &&
	cat >todo <<-\EOF &&
	pick A
	fixup -CA1
	pick B
	fixup -cA2
	EOF
	(
		set_replace_editor todo &&
		FAKE_COMMIT_MESSAGE="edited and fixed up" \
			git rebase -i initial initial
	) &&
	git log --pretty=format:%B initial.. >actual &&
	cat >expect <<-EOF &&
	edited and fixed up
	$EMPTY
	new subject
	$EMPTY
	new
	body
	EOF
	test_cmp expect actual
'

test_done
Commit	Line	Data
1d410cd8 CM	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2018 Phillip Wood
	4	#
	5
	6	test_description='git rebase interactive fixup options
	7
	8	This test checks the "fixup [-C\|-c]" command of rebase interactive.
	9	In addition to amending the contents of the commit, "fixup -C"
	10	replaces the original commit message with the message of the fixup
	11	commit. "fixup -c" also replaces the original message, but opens the
d8bd0806 CM	12	editor to allow the user to edit the message before committing. Similar
	13	to the "fixup" command that works with "fixup!", "fixup -C" works with
	14	"amend!" upon --autosquash.
1d410cd8 CM	15	'
1d410cd8 CM	16
9ff2f060	17	TEST_PASSES_SANITIZE_LEAK=true
1d410cd8 CM	18	. ./test-lib.sh
	19
	20	. "$TEST_DIRECTORY"/lib-rebase.sh
	21
	22	EMPTY=""
	23
1d410cd8 CM	24	get_author () {
1d410cd8 CM	25	rev="$1" &&
4755fed0	26	git log -1 --pretty=format:"%an %ae %at" "$rev"
1d410cd8 CM	27	}
	28
	29	test_expect_success 'setup' '
	30	cat >message <<-EOF &&
17665167 CM	31	amend! B
	32	$EMPTY
	33	new subject
	34	$EMPTY
	35	new
	36	body
	37	EOF
1d410cd8	38
666b6e11	39	test_commit initial &&
1d410cd8 CM	40	test_commit A A &&
	41	test_commit B B &&
	42	get_author HEAD >expected-author &&
	43	ORIG_AUTHOR_NAME="$GIT_AUTHOR_NAME" &&
	44	ORIG_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" &&
	45	GIT_AUTHOR_NAME="Amend Author" &&
	46	GIT_AUTHOR_EMAIL="amend@example.com" &&
	47	test_commit "$(cat message)" A A1 A1 &&
	48	test_commit A2 A &&
	49	test_commit A3 A &&
	50	GIT_AUTHOR_NAME="$ORIG_AUTHOR_NAME" &&
	51	GIT_AUTHOR_EMAIL="$ORIG_AUTHOR_EMAIL" &&
	52	git checkout -b conflicts-branch A &&
	53	test_commit conflicts A &&
	54
	55	set_fake_editor &&
	56	git checkout -b branch B &&
	57	echo B1 >B &&
	58	test_tick &&
	59	git commit --fixup=HEAD -a &&
9c7650c4	60	git tag B1 &&
1d410cd8	61	test_tick &&
8bedae45	62	FAKE_COMMIT_AMEND="edited 1" git commit --fixup=reword:B &&
1d410cd8	63	test_tick &&
8bedae45	64	FAKE_COMMIT_AMEND="edited 2" git commit --fixup=reword:HEAD &&
1d410cd8 CM	65	echo B2 >B &&
	66	test_tick &&
	67	FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a &&
9c7650c4	68	git tag B2 &&
1d410cd8 CM	69	echo B3 >B &&
1d410cd8 CM	70	test_tick &&
8bedae45	71	FAKE_COMMIT_AMEND="edited 3" git commit -a --fixup=amend:HEAD^ &&
9c7650c4	72	git tag B3 &&
1d410cd8 CM	73
	74	GIT_AUTHOR_NAME="Rebase Author" &&
	75	GIT_AUTHOR_EMAIL="rebase.author@example.com" &&
	76	GIT_COMMITTER_NAME="Rebase Committer" &&
	77	GIT_COMMITTER_EMAIL="rebase.committer@example.com"
	78	'
	79
	80	test_expect_success 'simple fixup -C works' '
	81	test_when_finished "test_might_fail git rebase --abort" &&
	82	git checkout --detach A2 &&
	83	FAKE_LINES="1 fixup_-C 2" git rebase -i B &&
	84	test_cmp_rev HEAD^ B &&
	85	test_cmp_rev HEAD^{tree} A2^{tree} &&
	86	test_commit_message HEAD -m "A2"
	87	'
	88
	89	test_expect_success 'simple fixup -c works' '
	90	test_when_finished "test_might_fail git rebase --abort" &&
	91	git checkout --detach A2 &&
	92	git log -1 --pretty=format:%B >expected-fixup-message &&
	93	test_write_lines "" "Modified A2" >>expected-fixup-message &&
	94	FAKE_LINES="1 fixup_-c 2" \
	95	FAKE_COMMIT_AMEND="Modified A2" \
	96	git rebase -i B &&
	97	test_cmp_rev HEAD^ B &&
	98	test_cmp_rev HEAD^{tree} A2^{tree} &&
	99	test_commit_message HEAD expected-fixup-message
	100	'
	101
	102	test_expect_success 'fixup -C removes amend! from message' '
	103	test_when_finished "test_might_fail git rebase --abort" &&
	104	git checkout --detach A1 &&
733ad2e1	105	git log -1 --pretty=format:%b >expected-message &&
1d410cd8 CM	106	FAKE_LINES="1 fixup_-C 2" git rebase -i A &&
	107	test_cmp_rev HEAD^ A &&
	108	test_cmp_rev HEAD^{tree} A1^{tree} &&
	109	test_commit_message HEAD expected-message &&
	110	get_author HEAD >actual-author &&
	111	test_cmp expected-author actual-author
	112	'
	113
	114	test_expect_success 'fixup -C with conflicts gives correct message' '
	115	test_when_finished "test_might_fail git rebase --abort" &&
	116	git checkout --detach A1 &&
733ad2e1 CM	117	git log -1 --pretty=format:%b >expected-message &&
733ad2e1 CM	118	test_write_lines "" "edited" >>expected-message &&
1d410cd8 CM	119	test_must_fail env FAKE_LINES="1 fixup_-C 2" git rebase -i conflicts &&
	120	git checkout --theirs -- A &&
	121	git add A &&
	122	FAKE_COMMIT_AMEND=edited git rebase --continue &&
	123	test_cmp_rev HEAD^ conflicts &&
	124	test_cmp_rev HEAD^{tree} A1^{tree} &&
1d410cd8 CM	125	test_commit_message HEAD expected-message &&
	126	get_author HEAD >actual-author &&
	127	test_cmp expected-author actual-author
	128	'
	129
	130	test_expect_success 'skipping fixup -C after fixup gives correct message' '
	131	test_when_finished "test_might_fail git rebase --abort" &&
	132	git checkout --detach A3 &&
	133	test_must_fail env FAKE_LINES="1 fixup 2 fixup_-C 4" git rebase -i A &&
	134	git reset --hard &&
	135	FAKE_COMMIT_AMEND=edited git rebase --continue &&
	136	test_commit_message HEAD -m "B"
	137	'
	138
	139	test_expect_success 'sequence of fixup, fixup -C & squash --signoff works' '
9c7650c4	140	git checkout --detach B3 &&
1d410cd8 CM	141	FAKE_LINES="1 fixup 2 fixup_-C 3 fixup_-C 4 squash 5 fixup_-C 6" \
	142	FAKE_COMMIT_AMEND=squashed \
	143	FAKE_MESSAGE_COPY=actual-squash-message \
	144	git -c commit.status=false rebase -ik --signoff A &&
9c7650c4	145	git diff-tree --exit-code --patch HEAD B3 -- &&
1d410cd8	146	test_cmp_rev HEAD^ A &&
feeb03bc	147	test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
1d410cd8 CM	148	actual-squash-message
	149	'
	150
	151	test_expect_success 'first fixup -C commented out in sequence fixup fixup -C fixup -C' '
	152	test_when_finished "test_might_fail git rebase --abort" &&
9c7650c4	153	git checkout --detach B2~ &&
1d410cd8 CM	154	git log -1 --pretty=format:%b >expected-message &&
	155	FAKE_LINES="1 fixup 2 fixup_-C 3 fixup_-C 4" git rebase -i A &&
	156	test_cmp_rev HEAD^ A &&
	157	test_commit_message HEAD expected-message
	158	'
	159
	160	test_expect_success 'multiple fixup -c opens editor once' '
	161	test_when_finished "test_might_fail git rebase --abort" &&
	162	git checkout --detach A3 &&
9ff6b74b CM	163	git log -1 --pretty=format:%B >expected-message &&
	164	test_write_lines "" "Modified-A3" >>expected-message &&
	165	FAKE_COMMIT_AMEND="Modified-A3" \
1d410cd8 CM	166	FAKE_LINES="1 fixup_-C 2 fixup_-c 3 fixup_-c 4" \
1d410cd8 CM	167	EXPECT_HEADER_COUNT=4 \
9c7650c4 CM	168	git rebase -i A &&
9c7650c4 CM	169	test_cmp_rev HEAD^ A &&
4755fed0 CM	170	get_author HEAD >actual-author &&
4755fed0 CM	171	test_cmp expected-author actual-author &&
9ff6b74b	172	test_commit_message HEAD expected-message
1d410cd8 CM	173	'
	174
	175	test_expect_success 'sequence squash, fixup & fixup -c gives combined message' '
	176	test_when_finished "test_might_fail git rebase --abort" &&
	177	git checkout --detach A3 &&
	178	FAKE_LINES="1 squash 2 fixup 3 fixup_-c 4" \
	179	FAKE_MESSAGE_COPY=actual-combined-message \
	180	git -c commit.status=false rebase -i A &&
feeb03bc	181	test_cmp "$TEST_DIRECTORY/t3437/expected-combined-message" \
1d410cd8 CM	182	actual-combined-message &&
	183	test_cmp_rev HEAD^ A
	184	'
	185
bae5b4ae	186	test_expect_success 'fixup -C works upon --autosquash with amend!' '
9c7650c4	187	git checkout --detach B3 &&
bae5b4ae CM	188	FAKE_COMMIT_AMEND=squashed \
	189	FAKE_MESSAGE_COPY=actual-squash-message \
	190	git -c commit.status=false rebase -ik --autosquash \
	191	--signoff A &&
9c7650c4	192	git diff-tree --exit-code --patch HEAD B3 -- &&
bae5b4ae	193	test_cmp_rev HEAD^ A &&
feeb03bc	194	test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
bae5b4ae CM	195	actual-squash-message
	196	'
	197
666b6e11 PW	198	test_expect_success 'fixup -[Cc]<commit> works' '
	199	test_when_finished "test_might_fail git rebase --abort" &&
	200	cat >todo <<-\EOF &&
	201	pick A
	202	fixup -CA1
	203	pick B
	204	fixup -cA2
	205	EOF
	206	(
	207	set_replace_editor todo &&
	208	FAKE_COMMIT_MESSAGE="edited and fixed up" \
	209	git rebase -i initial initial
	210	) &&
	211	git log --pretty=format:%B initial.. >actual &&
	212	cat >expect <<-EOF &&
	213	edited and fixed up
	214	$EMPTY
	215	new subject
	216	$EMPTY
	217	new
	218	body
	219	EOF
	220	test_cmp expect actual
	221	'
	222
1d410cd8	223	test_done