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

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

test_description='git rebase --autostash tests'
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME

. ./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 main &&
	echo unrelated >file4 &&
	git add . &&
	test_tick &&
	git commit -m "unrelated commit" &&
	git checkout -b related-onto-branch main &&
	echo conflicting-change >file2 &&
	git add . &&
	test_tick &&
	git commit -m "related commit" &&
	remove_progress_re="$(printf "s/.*\\r//")"
'

create_expected_success_apply () {
	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_merge () {
	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_apply () {
	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_merge () {
	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:-apply} &&
		if test ${suffix} = "interactive"; then
			suffix=merge
		fi &&
		create_expected_success_$suffix &&
		sed "$remove_progress_re" <actual >actual2 &&
		test_cmp 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: --quit" '
		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 diff >expect &&
		test_must_fail git rebase$type related-onto-branch &&
		test_path_is_file $dotest/autostash &&
		test_path_is_missing file3 &&
		git rebase --quit &&
		test_when_finished git stash drop &&
		test_path_is_missing $dotest/autostash &&
		! grep dirty file3 &&
		git stash show -p >actual &&
		test_cmp expect actual &&
		git reset --hard &&
		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:-apply} &&
		if test ${suffix} = "interactive"; then
			suffix=merge
		fi &&
		create_expected_failure_$suffix &&
		sed "$remove_progress_re" <actual >actual2 &&
		test_cmp 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 " --apply" .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 main" &&
	git checkout -b with-submodule &&
	git -c protocol.file.allow=always 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 main" &&
	echo changed >file0 &&
	git rebase --autostash not-the-feature-branch feature-branch &&
	test_cmp_rev not-the-feature-branch unrelated-onto-branch
'

test_expect_success 'autostash commit is marked as reachable' '
	echo changed >file0 &&
	git rebase --autostash --exec "git prune --expire=now" \
		feature-branch^ feature-branch &&
	# git rebase succeeds if the stash cannot be applied so we need to check
	# the contents of file0
	echo changed >expect &&
	test_cmp expect file0
'

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