[thirdparty/git.git] / t / t3420-rebase-autostash.sh

#!/bin/sh
#
# Copyright (c) 2013 Ramkumar Ramachandra
#

test_description='git rebase --autostash tests'
. ./test-lib.sh

test_expect_success setup '
	echo hello-world >file0 &&
	git add . &&
	test_tick &&
	git commit -m "initial commit" &&
	git checkout -b feature-branch &&
	echo another-hello >file1 &&
	echo goodbye >file2 &&
	git add . &&
	test_tick &&
	git commit -m "second commit" &&
	echo final-goodbye >file3 &&
	git add . &&
	test_tick &&
	git commit -m "third commit" &&
	git checkout -b unrelated-onto-branch master &&
	echo unrelated >file4 &&
	git add . &&
	test_tick &&
	git commit -m "unrelated commit" &&
	git checkout -b related-onto-branch master &&
	echo conflicting-change >file2 &&
	git add . &&
	test_tick &&
	git commit -m "related commit" &&
	remove_progress_re="$(printf "s/.*\\r//")"
'

create_expected_success_am () {
	cat >expected <<-EOF
	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
	First, rewinding head to replay your work on top of it...
	Applying: second commit
	Applying: third commit
	Applied autostash.
	EOF
}

create_expected_success_interactive () {
	q_to_cr >expected <<-EOF
	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
	Applied autostash.
	Successfully rebased and updated refs/heads/rebased-feature-branch.
	EOF
}

create_expected_failure_am () {
	cat >expected <<-EOF
	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
	First, rewinding head to replay your work on top of it...
	Applying: second commit
	Applying: third commit
	Applying autostash resulted in conflicts.
	Your changes are safe in the stash.
	You can run "git stash pop" or "git stash drop" at any time.
	EOF
}

create_expected_failure_interactive () {
	cat >expected <<-EOF
	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
	Applying autostash resulted in conflicts.
	Your changes are safe in the stash.
	You can run "git stash pop" or "git stash drop" at any time.
	Successfully rebased and updated refs/heads/rebased-feature-branch.
	EOF
}

testrebase () {
	type=$1
	dotest=$2

	test_expect_success "rebase$type: dirty worktree, --no-autostash" '
		test_config rebase.autostash true &&
		git reset --hard &&
		git checkout -b rebased-feature-branch feature-branch &&
		test_when_finished git branch -D rebased-feature-branch &&
		test_when_finished git checkout feature-branch &&
		echo dirty >>file3 &&
		test_must_fail git rebase$type --no-autostash unrelated-onto-branch
	'

	test_expect_success "rebase$type: dirty worktree, non-conflicting rebase" '
		test_config rebase.autostash true &&
		git reset --hard &&
		git checkout -b rebased-feature-branch feature-branch &&
		echo dirty >>file3 &&
		git rebase$type unrelated-onto-branch >actual 2>&1 &&
		grep unrelated file4 &&
		grep dirty file3 &&
		git checkout feature-branch
	'

	test_expect_success "rebase$type --autostash: check output" '
		test_when_finished git branch -D rebased-feature-branch &&
		suffix=${type#\ --} && suffix=${suffix:-am} &&
		if test ${suffix} = "merge"; then
			suffix=interactive
		fi &&
		create_expected_success_$suffix &&
		sed "$remove_progress_re" <actual >actual2 &&
		test_i18ncmp expected actual2
	'

	test_expect_success "rebase$type: dirty index, non-conflicting rebase" '
		test_config rebase.autostash true &&
		git reset --hard &&
		git checkout -b rebased-feature-branch feature-branch &&
		test_when_finished git branch -D rebased-feature-branch &&
		echo dirty >>file3 &&
		git add file3 &&
		git rebase$type unrelated-onto-branch &&
		grep unrelated file4 &&
		grep dirty file3 &&
		git checkout feature-branch
	'

	test_expect_success "rebase$type: conflicting rebase" '
		test_config rebase.autostash true &&
		git reset --hard &&
		git checkout -b rebased-feature-branch feature-branch &&
		test_when_finished git branch -D rebased-feature-branch &&
		echo dirty >>file3 &&
		test_must_fail git rebase$type related-onto-branch &&
		test_path_is_file $dotest/autostash &&
		test_path_is_missing file3 &&
		rm -rf $dotest &&
		git reset --hard &&
		git checkout feature-branch
	'

	test_expect_success "rebase$type: --continue" '
		test_config rebase.autostash true &&
		git reset --hard &&
		git checkout -b rebased-feature-branch feature-branch &&
		test_when_finished git branch -D rebased-feature-branch &&
		echo dirty >>file3 &&
		test_must_fail git rebase$type related-onto-branch &&
		test_path_is_file $dotest/autostash &&
		test_path_is_missing file3 &&
		echo "conflicting-plus-goodbye" >file2 &&
		git add file2 &&
		git rebase --continue &&
		test_path_is_missing $dotest/autostash &&
		grep dirty file3 &&
		git checkout feature-branch
	'

	test_expect_success "rebase$type: --skip" '
		test_config rebase.autostash true &&
		git reset --hard &&
		git checkout -b rebased-feature-branch feature-branch &&
		test_when_finished git branch -D rebased-feature-branch &&
		echo dirty >>file3 &&
		test_must_fail git rebase$type related-onto-branch &&
		test_path_is_file $dotest/autostash &&
		test_path_is_missing file3 &&
		git rebase --skip &&
		test_path_is_missing $dotest/autostash &&
		grep dirty file3 &&
		git checkout feature-branch
	'

	test_expect_success "rebase$type: --abort" '
		test_config rebase.autostash true &&
		git reset --hard &&
		git checkout -b rebased-feature-branch feature-branch &&
		test_when_finished git branch -D rebased-feature-branch &&
		echo dirty >>file3 &&
		test_must_fail git rebase$type related-onto-branch &&
		test_path_is_file $dotest/autostash &&
		test_path_is_missing file3 &&
		git rebase --abort &&
		test_path_is_missing $dotest/autostash &&
		grep dirty file3 &&
		git checkout feature-branch
	'

	test_expect_success "rebase$type: non-conflicting rebase, conflicting stash" '
		test_config rebase.autostash true &&
		git reset --hard &&
		git checkout -b rebased-feature-branch feature-branch &&
		echo dirty >file4 &&
		git add file4 &&
		git rebase$type unrelated-onto-branch >actual 2>&1 &&
		test_path_is_missing $dotest &&
		git reset --hard &&
		grep unrelated file4 &&
		! grep dirty file4 &&
		git checkout feature-branch &&
		git stash pop &&
		grep dirty file4
	'

	test_expect_success "rebase$type: check output with conflicting stash" '
		test_when_finished git branch -D rebased-feature-branch &&
		suffix=${type#\ --} && suffix=${suffix:-am} &&
		if test ${suffix} = "merge"; then
			suffix=interactive
		fi &&
		create_expected_failure_$suffix &&
		sed "$remove_progress_re" <actual >actual2 &&
		test_i18ncmp expected actual2
	'
}

test_expect_success "rebase: fast-forward rebase" '
	test_config rebase.autostash true &&
	git reset --hard &&
	git checkout -b behind-feature-branch feature-branch~1 &&
	test_when_finished git branch -D behind-feature-branch &&
	echo dirty >>file1 &&
	git rebase feature-branch &&
	grep dirty file1 &&
	git checkout feature-branch
'

test_expect_success "rebase: noop rebase" '
	test_config rebase.autostash true &&
	git reset --hard &&
	git checkout -b same-feature-branch feature-branch &&
	test_when_finished git branch -D same-feature-branch &&
	echo dirty >>file1 &&
	git rebase feature-branch &&
	grep dirty file1 &&
	git checkout feature-branch
'

testrebase "" .git/rebase-apply
testrebase " --merge" .git/rebase-merge
testrebase " --interactive" .git/rebase-merge

test_expect_success 'abort rebase -i with --autostash' '
	test_when_finished "git reset --hard" &&
	echo uncommitted-content >file0 &&
	(
		write_script abort-editor.sh <<-\EOF &&
			echo >"$1"
		EOF
		test_set_editor "$(pwd)/abort-editor.sh" &&
		test_must_fail git rebase -i --autostash HEAD^ &&
		rm -f abort-editor.sh
	) &&
	echo uncommitted-content >expected &&
	test_cmp expected file0
'

test_expect_success 'restore autostash on editor failure' '
	test_when_finished "git reset --hard" &&
	echo uncommitted-content >file0 &&
	(
		test_set_editor "false" &&
		test_must_fail git rebase -i --autostash HEAD^
	) &&
	echo uncommitted-content >expected &&
	test_cmp expected file0
'

test_expect_success 'autostash is saved on editor failure with conflict' '
	test_when_finished "git reset --hard" &&
	echo uncommitted-content >file0 &&
	(
		write_script abort-editor.sh <<-\EOF &&
			echo conflicting-content >file0
			exit 1
		EOF
		test_set_editor "$(pwd)/abort-editor.sh" &&
		test_must_fail git rebase -i --autostash HEAD^ &&
		rm -f abort-editor.sh
	) &&
	echo conflicting-content >expected &&
	test_cmp expected file0 &&
	git checkout file0 &&
	git stash pop &&
	echo uncommitted-content >expected &&
	test_cmp expected file0
'

test_expect_success 'autostash with dirty submodules' '
	test_when_finished "git reset --hard && git checkout master" &&
	git checkout -b with-submodule &&
	git submodule add ./ sub &&
	test_tick &&
	git commit -m add-submodule &&
	echo changed >sub/file0 &&
	git rebase -i --autostash HEAD
'

test_expect_success 'branch is left alone when possible' '
	git checkout -b unchanged-branch &&
	echo changed >file0 &&
	git rebase --autostash unchanged-branch &&
	test changed = "$(cat file0)" &&
	test unchanged-branch = "$(git rev-parse --abbrev-ref HEAD)"
'

test_expect_success 'never change active branch' '
	git checkout -b not-the-feature-branch unrelated-onto-branch &&
	test_when_finished "git reset --hard && git checkout master" &&
	echo changed >file0 &&
	git rebase --autostash not-the-feature-branch feature-branch &&
	test_cmp_rev not-the-feature-branch unrelated-onto-branch
'

test_done
Commit	Line	Data
58794775 RR	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2013 Ramkumar Ramachandra
	4	#
	5
	6	test_description='git rebase --autostash tests'
	7	. ./test-lib.sh
	8
	9	test_expect_success setup '
	10	echo hello-world >file0 &&
	11	git add . &&
	12	test_tick &&
	13	git commit -m "initial commit" &&
	14	git checkout -b feature-branch &&
	15	echo another-hello >file1 &&
	16	echo goodbye >file2 &&
	17	git add . &&
	18	test_tick &&
	19	git commit -m "second commit" &&
	20	echo final-goodbye >file3 &&
	21	git add . &&
	22	test_tick &&
	23	git commit -m "third commit" &&
	24	git checkout -b unrelated-onto-branch master &&
	25	echo unrelated >file4 &&
	26	git add . &&
	27	test_tick &&
	28	git commit -m "unrelated commit" &&
	29	git checkout -b related-onto-branch master &&
	30	echo conflicting-change >file2 &&
	31	git add . &&
	32	test_tick &&
bb431c3d PW	33	git commit -m "related commit" &&
bb431c3d PW	34	remove_progress_re="$(printf "s/.*\\r//")"
58794775 RR	35	'
58794775 RR	36
b76aeae5 PW	37	create_expected_success_am () {
	38	cat >expected <<-EOF
	39	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
b76aeae5 PW	40	First, rewinding head to replay your work on top of it...
	41	Applying: second commit
	42	Applying: third commit
	43	Applied autostash.
	44	EOF
	45	}
	46
	47	create_expected_success_interactive () {
	48	q_to_cr >expected <<-EOF
	49	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
bb431c3d PW	50	Applied autostash.
bb431c3d PW	51	Successfully rebased and updated refs/heads/rebased-feature-branch.
b76aeae5 PW	52	EOF
	53	}
	54
7d70e6b9 PW	55	create_expected_failure_am () {
	56	cat >expected <<-EOF
	57	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
7d70e6b9 PW	58	First, rewinding head to replay your work on top of it...
	59	Applying: second commit
	60	Applying: third commit
	61	Applying autostash resulted in conflicts.
	62	Your changes are safe in the stash.
	63	You can run "git stash pop" or "git stash drop" at any time.
	64	EOF
	65	}
	66
	67	create_expected_failure_interactive () {
bb431c3d	68	cat >expected <<-EOF
7d70e6b9	69	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
bb431c3d	70	Applying autostash resulted in conflicts.
7d70e6b9 PW	71	Your changes are safe in the stash.
7d70e6b9 PW	72	You can run "git stash pop" or "git stash drop" at any time.
bb431c3d	73	Successfully rebased and updated refs/heads/rebased-feature-branch.
7d70e6b9 PW	74	EOF
	75	}
	76
b76aeae5	77	testrebase () {
58794775 RR	78	type=$1
	79	dotest=$2
	80
619e3604 JK	81	test_expect_success "rebase$type: dirty worktree, --no-autostash" '
	82	test_config rebase.autostash true &&
	83	git reset --hard &&
	84	git checkout -b rebased-feature-branch feature-branch &&
	85	test_when_finished git branch -D rebased-feature-branch &&
	86	test_when_finished git checkout feature-branch &&
	87	echo dirty >>file3 &&
	88	test_must_fail git rebase$type --no-autostash unrelated-onto-branch
	89	'
	90
58794775 RR	91	test_expect_success "rebase$type: dirty worktree, non-conflicting rebase" '
	92	test_config rebase.autostash true &&
	93	git reset --hard &&
	94	git checkout -b rebased-feature-branch feature-branch &&
58794775	95	echo dirty >>file3 &&
b76aeae5	96	git rebase$type unrelated-onto-branch >actual 2>&1 &&
58794775 RR	97	grep unrelated file4 &&
	98	grep dirty file3 &&
	99	git checkout feature-branch
	100	'
	101
b76aeae5 PW	102	test_expect_success "rebase$type --autostash: check output" '
	103	test_when_finished git branch -D rebased-feature-branch &&
	104	suffix=${type#\ --} && suffix=${suffix:-am} &&
68aa495b EN	105	if test ${suffix} = "merge"; then
	106	suffix=interactive
	107	fi &&
b76aeae5	108	create_expected_success_$suffix &&
bb431c3d PW	109	sed "$remove_progress_re" <actual >actual2 &&
bb431c3d PW	110	test_i18ncmp expected actual2
b76aeae5 PW	111	'
b76aeae5 PW	112
58794775 RR	113	test_expect_success "rebase$type: dirty index, non-conflicting rebase" '
	114	test_config rebase.autostash true &&
	115	git reset --hard &&
	116	git checkout -b rebased-feature-branch feature-branch &&
	117	test_when_finished git branch -D rebased-feature-branch &&
	118	echo dirty >>file3 &&
	119	git add file3 &&
	120	git rebase$type unrelated-onto-branch &&
	121	grep unrelated file4 &&
	122	grep dirty file3 &&
	123	git checkout feature-branch
	124	'
	125
	126	test_expect_success "rebase$type: conflicting rebase" '
	127	test_config rebase.autostash true &&
	128	git reset --hard &&
	129	git checkout -b rebased-feature-branch feature-branch &&
	130	test_when_finished git branch -D rebased-feature-branch &&
	131	echo dirty >>file3 &&
	132	test_must_fail git rebase$type related-onto-branch &&
	133	test_path_is_file $dotest/autostash &&
27458170	134	test_path_is_missing file3 &&
58794775 RR	135	rm -rf $dotest &&
	136	git reset --hard &&
	137	git checkout feature-branch
	138	'
	139
	140	test_expect_success "rebase$type: --continue" '
	141	test_config rebase.autostash true &&
	142	git reset --hard &&
	143	git checkout -b rebased-feature-branch feature-branch &&
	144	test_when_finished git branch -D rebased-feature-branch &&
	145	echo dirty >>file3 &&
	146	test_must_fail git rebase$type related-onto-branch &&
	147	test_path_is_file $dotest/autostash &&
27458170	148	test_path_is_missing file3 &&
58794775 RR	149	echo "conflicting-plus-goodbye" >file2 &&
	150	git add file2 &&
	151	git rebase --continue &&
	152	test_path_is_missing $dotest/autostash &&
	153	grep dirty file3 &&
	154	git checkout feature-branch
	155	'
	156
	157	test_expect_success "rebase$type: --skip" '
	158	test_config rebase.autostash true &&
	159	git reset --hard &&
	160	git checkout -b rebased-feature-branch feature-branch &&
	161	test_when_finished git branch -D rebased-feature-branch &&
	162	echo dirty >>file3 &&
	163	test_must_fail git rebase$type related-onto-branch &&
	164	test_path_is_file $dotest/autostash &&
27458170	165	test_path_is_missing file3 &&
58794775 RR	166	git rebase --skip &&
	167	test_path_is_missing $dotest/autostash &&
	168	grep dirty file3 &&
	169	git checkout feature-branch
	170	'
	171
	172	test_expect_success "rebase$type: --abort" '
	173	test_config rebase.autostash true &&
	174	git reset --hard &&
	175	git checkout -b rebased-feature-branch feature-branch &&
	176	test_when_finished git branch -D rebased-feature-branch &&
	177	echo dirty >>file3 &&
	178	test_must_fail git rebase$type related-onto-branch &&
	179	test_path_is_file $dotest/autostash &&
27458170	180	test_path_is_missing file3 &&
58794775 RR	181	git rebase --abort &&
	182	test_path_is_missing $dotest/autostash &&
	183	grep dirty file3 &&
	184	git checkout feature-branch
	185	'
	186
	187	test_expect_success "rebase$type: non-conflicting rebase, conflicting stash" '
	188	test_config rebase.autostash true &&
	189	git reset --hard &&
	190	git checkout -b rebased-feature-branch feature-branch &&
58794775 RR	191	echo dirty >file4 &&
58794775 RR	192	git add file4 &&
7d70e6b9	193	git rebase$type unrelated-onto-branch >actual 2>&1 &&
58794775 RR	194	test_path_is_missing $dotest &&
	195	git reset --hard &&
	196	grep unrelated file4 &&
	197	! grep dirty file4 &&
	198	git checkout feature-branch &&
	199	git stash pop &&
	200	grep dirty file4
	201	'
7d70e6b9 PW	202
	203	test_expect_success "rebase$type: check output with conflicting stash" '
	204	test_when_finished git branch -D rebased-feature-branch &&
	205	suffix=${type#\ --} && suffix=${suffix:-am} &&
68aa495b EN	206	if test ${suffix} = "merge"; then
	207	suffix=interactive
	208	fi &&
7d70e6b9	209	create_expected_failure_$suffix &&
bb431c3d PW	210	sed "$remove_progress_re" <actual >actual2 &&
bb431c3d PW	211	test_i18ncmp expected actual2
7d70e6b9	212	'
58794775 RR	213	}
58794775 RR	214
af2f0ebc RR	215	test_expect_success "rebase: fast-forward rebase" '
	216	test_config rebase.autostash true &&
	217	git reset --hard &&
	218	git checkout -b behind-feature-branch feature-branch~1 &&
	219	test_when_finished git branch -D behind-feature-branch &&
	220	echo dirty >>file1 &&
	221	git rebase feature-branch &&
	222	grep dirty file1 &&
	223	git checkout feature-branch
	224	'
	225
96e2b99e RR	226	test_expect_success "rebase: noop rebase" '
	227	test_config rebase.autostash true &&
	228	git reset --hard &&
	229	git checkout -b same-feature-branch feature-branch &&
	230	test_when_finished git branch -D same-feature-branch &&
	231	echo dirty >>file1 &&
	232	git rebase feature-branch &&
	233	grep dirty file1 &&
	234	git checkout feature-branch
	235	'
	236
58794775 RR	237	testrebase "" .git/rebase-apply
	238	testrebase " --merge" .git/rebase-merge
	239	testrebase " --interactive" .git/rebase-merge
	240
ddb5432d MM	241	test_expect_success 'abort rebase -i with --autostash' '
ddb5432d MM	242	test_when_finished "git reset --hard" &&
2e3a16b2	243	echo uncommitted-content >file0 &&
ddb5432d MM	244	(
	245	write_script abort-editor.sh <<-\EOF &&
	246	echo >"$1"
	247	EOF
	248	test_set_editor "$(pwd)/abort-editor.sh" &&
	249	test_must_fail git rebase -i --autostash HEAD^ &&
	250	rm -f abort-editor.sh
	251	) &&
2e3a16b2	252	echo uncommitted-content >expected &&
ddb5432d MM	253	test_cmp expected file0
	254	'
	255
33ba9c64 PS	256	test_expect_success 'restore autostash on editor failure' '
	257	test_when_finished "git reset --hard" &&
	258	echo uncommitted-content >file0 &&
	259	(
	260	test_set_editor "false" &&
	261	test_must_fail git rebase -i --autostash HEAD^
	262	) &&
	263	echo uncommitted-content >expected &&
	264	test_cmp expected file0
	265	'
	266
	267	test_expect_success 'autostash is saved on editor failure with conflict' '
	268	test_when_finished "git reset --hard" &&
	269	echo uncommitted-content >file0 &&
	270	(
	271	write_script abort-editor.sh <<-\EOF &&
	272	echo conflicting-content >file0
	273	exit 1
	274	EOF
	275	test_set_editor "$(pwd)/abort-editor.sh" &&
	276	test_must_fail git rebase -i --autostash HEAD^ &&
	277	rm -f abort-editor.sh
	278	) &&
	279	echo conflicting-content >expected &&
	280	test_cmp expected file0 &&
	281	git checkout file0 &&
	282	git stash pop &&
	283	echo uncommitted-content >expected &&
	284	test_cmp expected file0
	285	'
	286
ffae8b2f	287	test_expect_success 'autostash with dirty submodules' '
97bd162c JS	288	test_when_finished "git reset --hard && git checkout master" &&
	289	git checkout -b with-submodule &&
	290	git submodule add ./ sub &&
	291	test_tick &&
	292	git commit -m add-submodule &&
	293	echo changed >sub/file0 &&
	294	git rebase -i --autostash HEAD
	295	'
	296
176f5d96	297	test_expect_success 'branch is left alone when possible' '
2dac2bc8 JS	298	git checkout -b unchanged-branch &&
	299	echo changed >file0 &&
	300	git rebase --autostash unchanged-branch &&
	301	test changed = "$(cat file0)" &&
	302	test unchanged-branch = "$(git rev-parse --abbrev-ref HEAD)"
	303	'
	304
d2172ef0 BW	305	test_expect_success 'never change active branch' '
	306	git checkout -b not-the-feature-branch unrelated-onto-branch &&
	307	test_when_finished "git reset --hard && git checkout master" &&
	308	echo changed >file0 &&
	309	git rebase --autostash not-the-feature-branch feature-branch &&
	310	test_cmp_rev not-the-feature-branch unrelated-onto-branch
	311	'
	312
58794775	313	test_done