[thirdparty/git.git] / t / t3404-rebase-interactive.sh

#!/bin/sh
#
# Copyright (c) 2007 Johannes E. Schindelin
#

test_description='git rebase interactive

This test runs git rebase "interactively", by faking an edit, and verifies
that the result still makes sense.
'
. ./test-lib.sh

# set up two branches like this:
#
# A - B - C - D - E
#   \
#     F - G - H
#       \
#         I
#
# where B, D and G touch the same file.

test_expect_success 'setup' '
	: > file1 &&
	git add file1 &&
	test_tick &&
	git commit -m A &&
	git tag A &&
	echo 1 > file1 &&
	test_tick &&
	git commit -m B file1 &&
	: > file2 &&
	git add file2 &&
	test_tick &&
	git commit -m C &&
	echo 2 > file1 &&
	test_tick &&
	git commit -m D file1 &&
	: > file3 &&
	git add file3 &&
	test_tick &&
	git commit -m E &&
	git checkout -b branch1 A &&
	: > file4 &&
	git add file4 &&
	test_tick &&
	git commit -m F &&
	git tag F &&
	echo 3 > file1 &&
	test_tick &&
	git commit -m G file1 &&
	: > file5 &&
	git add file5 &&
	test_tick &&
	git commit -m H &&
	git checkout -b branch2 F &&
	: > file6 &&
	git add file6 &&
	test_tick &&
	git commit -m I &&
	git tag I
'

echo "#!$SHELL_PATH" >fake-editor.sh
cat >> fake-editor.sh <<\EOF
case "$1" in
*/COMMIT_EDITMSG)
	test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1"
	test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1"
	exit
	;;
esac
test -z "$EXPECT_COUNT" ||
	test "$EXPECT_COUNT" = $(sed -e '/^#/d' -e '/^$/d' < "$1" | wc -l) ||
	exit
test -z "$FAKE_LINES" && exit
grep -v '^#' < "$1" > "$1".tmp
rm -f "$1"
cat "$1".tmp
action=pick
for line in $FAKE_LINES; do
	case $line in
	squash|edit)
		action="$line";;
	*)
		echo sed -n "${line}s/^pick/$action/p"
		sed -n "${line}p" < "$1".tmp
		sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1"
		action=pick;;
	esac
done
EOF

test_set_editor "$(pwd)/fake-editor.sh"
chmod a+x fake-editor.sh

test_expect_success 'no changes are a nop' '
	git rebase -i F &&
	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
	test $(git rev-parse I) = $(git rev-parse HEAD)
'

test_expect_success 'test the [branch] option' '
	git checkout -b dead-end &&
	git rm file6 &&
	git commit -m "stop here" &&
	git rebase -i F branch2 &&
	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
	test $(git rev-parse I) = $(git rev-parse branch2) &&
	test $(git rev-parse I) = $(git rev-parse HEAD)
'

test_expect_success 'test --onto <branch>' '
	git checkout -b test-onto branch2 &&
	git rebase -i --onto branch1 F &&
	test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
	test $(git rev-parse HEAD^) = $(git rev-parse branch1) &&
	test $(git rev-parse I) = $(git rev-parse branch2)
'

test_expect_success 'rebase on top of a non-conflicting commit' '
	git checkout branch1 &&
	git tag original-branch1 &&
	git rebase -i branch2 &&
	test file6 = $(git diff --name-only original-branch1) &&
	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
	test $(git rev-parse I) = $(git rev-parse branch2) &&
	test $(git rev-parse I) = $(git rev-parse HEAD~2)
'

test_expect_success 'reflog for the branch shows state before rebase' '
	test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
'

test_expect_success 'exchange two commits' '
	FAKE_LINES="2 1" git rebase -i HEAD~2 &&
	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
	test G = $(git cat-file commit HEAD | sed -ne \$p)
'

cat > expect << EOF
diff --git a/file1 b/file1
index e69de29..00750ed 100644
--- a/file1
+++ b/file1
@@ -0,0 +1 @@
+3
EOF

cat > expect2 << EOF
<<<<<<< HEAD:file1
2
=======
3
>>>>>>> b7ca976... G:file1
EOF

test_expect_success 'stop on conflicting pick' '
	git tag new-branch1 &&
	test_must_fail git rebase -i master &&
	test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
	test_cmp expect .git/rebase-merge/patch &&
	test_cmp expect2 file1 &&
	test "$(git diff --name-status |
		sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
	test 4 = $(grep -v "^#" < .git/rebase-merge/done | wc -l) &&
	test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
'

test_expect_success 'abort' '
	git rebase --abort &&
	test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
	! test -d .git/rebase-merge
'

test_expect_success 'retain authorship' '
	echo A > file7 &&
	git add file7 &&
	test_tick &&
	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
	git tag twerp &&
	git rebase -i --onto master HEAD^ &&
	git show HEAD | grep "^Author: Twerp Snog"
'

test_expect_success 'squash' '
	git reset --hard twerp &&
	echo B > file7 &&
	test_tick &&
	GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
	echo "******************************" &&
	FAKE_LINES="1 squash 2" git rebase -i --onto master HEAD~2 &&
	test B = $(cat file7) &&
	test $(git rev-parse HEAD^) = $(git rev-parse master)
'

test_expect_success 'retain authorship when squashing' '
	git show HEAD | grep "^Author: Twerp Snog"
'

test_expect_success '-p handles "no changes" gracefully' '
	HEAD=$(git rev-parse HEAD) &&
	git rebase -i -p HEAD^ &&
	git update-index --refresh &&
	git diff-files --quiet &&
	git diff-index --quiet --cached HEAD -- &&
	test $HEAD = $(git rev-parse HEAD)
'

test_expect_success 'preserve merges with -p' '
	git checkout -b to-be-preserved master^ &&
	: > unrelated-file &&
	git add unrelated-file &&
	test_tick &&
	git commit -m "unrelated" &&
	git checkout -b another-branch master &&
	echo B > file1 &&
	test_tick &&
	git commit -m J file1 &&
	test_tick &&
	git merge to-be-preserved &&
	echo C > file1 &&
	test_tick &&
	git commit -m K file1 &&
	echo D > file1 &&
	test_tick &&
	git commit -m L1 file1 &&
	git checkout HEAD^ &&
	echo 1 > unrelated-file &&
	test_tick &&
	git commit -m L2 unrelated-file &&
	test_tick &&
	git merge another-branch &&
	echo E > file1 &&
	test_tick &&
	git commit -m M file1 &&
	git checkout -b to-be-rebased &&
	test_tick &&
	git rebase -i -p --onto branch1 master &&
	git update-index --refresh &&
	git diff-files --quiet &&
	git diff-index --quiet --cached HEAD -- &&
	test $(git rev-parse HEAD~6) = $(git rev-parse branch1) &&
	test $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) &&
	test $(git rev-parse HEAD^^2^) = $(git rev-parse HEAD^^^) &&
	test $(git show HEAD~5:file1) = B &&
	test $(git show HEAD~3:file1) = C &&
	test $(git show HEAD:file1) = E &&
	test $(git show HEAD:unrelated-file) = 1
'

test_expect_success 'edit ancestor with -p' '
	FAKE_LINES="1 edit 2 3 4" git rebase -i -p HEAD~3 &&
	echo 2 > unrelated-file &&
	test_tick &&
	git commit -m L2-modified --amend unrelated-file &&
	git rebase --continue &&
	git update-index --refresh &&
	git diff-files --quiet &&
	git diff-index --quiet --cached HEAD -- &&
	test $(git show HEAD:unrelated-file) = 2
'

test_expect_success '--continue tries to commit' '
	test_tick &&
	test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
	echo resolved > file1 &&
	git add file1 &&
	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
	test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
	git show HEAD | grep chouette
'

test_expect_success 'verbose flag is heeded, even after --continue' '
	git reset --hard HEAD@{1} &&
	test_tick &&
	test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
	echo resolved > file1 &&
	git add file1 &&
	git rebase --continue > output &&
	grep "^ file1 |    2 +-$" output
'

test_expect_success 'multi-squash only fires up editor once' '
	base=$(git rev-parse HEAD~4) &&
	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \
		git rebase -i $base &&
	test $base = $(git rev-parse HEAD^) &&
	test 1 = $(git show | grep ONCE | wc -l)
'

test_expect_success 'squash works as expected' '
	for n in one two three four
	do
		echo $n >> file$n &&
		git add file$n &&
		git commit -m $n
	done &&
	one=$(git rev-parse HEAD~3) &&
	FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
	test $one = $(git rev-parse HEAD~2)
'

test_expect_success 'interrupted squash works as expected' '
	for n in one two three four
	do
		echo $n >> conflict &&
		git add conflict &&
		git commit -m $n
	done &&
	one=$(git rev-parse HEAD~3) &&
	(
		FAKE_LINES="1 squash 3 2" &&
		export FAKE_LINES &&
		test_must_fail git rebase -i HEAD~3
	) &&
	(echo one; echo two; echo four) > conflict &&
	git add conflict &&
	test_must_fail git rebase --continue &&
	echo resolved > conflict &&
	git add conflict &&
	git rebase --continue &&
	test $one = $(git rev-parse HEAD~2)
'

test_expect_success 'interrupted squash works as expected (case 2)' '
	for n in one two three four
	do
		echo $n >> conflict &&
		git add conflict &&
		git commit -m $n
	done &&
	one=$(git rev-parse HEAD~3) &&
	(
		FAKE_LINES="3 squash 1 2" &&
		export FAKE_LINES &&
		test_must_fail git rebase -i HEAD~3
	) &&
	(echo one; echo four) > conflict &&
	git add conflict &&
	test_must_fail git rebase --continue &&
	(echo one; echo two; echo four) > conflict &&
	git add conflict &&
	test_must_fail git rebase --continue &&
	echo resolved > conflict &&
	git add conflict &&
	git rebase --continue &&
	test $one = $(git rev-parse HEAD~2)
'

test_expect_success 'ignore patch if in upstream' '
	HEAD=$(git rev-parse HEAD) &&
	git checkout -b has-cherry-picked HEAD^ &&
	echo unrelated > file7 &&
	git add file7 &&
	test_tick &&
	git commit -m "unrelated change" &&
	git cherry-pick $HEAD &&
	EXPECT_COUNT=1 git rebase -i $HEAD &&
	test $HEAD = $(git rev-parse HEAD^)
'

test_expect_success '--continue tries to commit, even for "edit"' '
	parent=$(git rev-parse HEAD^) &&
	test_tick &&
	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
	echo edited > file7 &&
	git add file7 &&
	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
	test edited = $(git show HEAD:file7) &&
	git show HEAD | grep chouette &&
	test $parent = $(git rev-parse HEAD^)
'

test_expect_success 'rebase a detached HEAD' '
	grandparent=$(git rev-parse HEAD~2) &&
	git checkout $(git rev-parse HEAD) &&
	test_tick &&
	FAKE_LINES="2 1" git rebase -i HEAD~2 &&
	test $grandparent = $(git rev-parse HEAD~2)
'

test_expect_success 'rebase a commit violating pre-commit' '

	mkdir -p .git/hooks &&
	PRE_COMMIT=.git/hooks/pre-commit &&
	echo "#!/bin/sh" > $PRE_COMMIT &&
	echo "test -z \"\$(git diff --cached --check)\"" >> $PRE_COMMIT &&
	chmod a+x $PRE_COMMIT &&
	echo "monde! " >> file1 &&
	test_tick &&
	test_must_fail git commit -m doesnt-verify file1 &&
	git commit -m doesnt-verify --no-verify file1 &&
	test_tick &&
	FAKE_LINES=2 git rebase -i HEAD~2

'

test_expect_success 'rebase with a file named HEAD in worktree' '

	rm -fr .git/hooks &&
	git reset --hard &&
	git checkout -b branch3 A &&

	(
		GIT_AUTHOR_NAME="Squashed Away" &&
		export GIT_AUTHOR_NAME &&
		>HEAD &&
		git add HEAD &&
		git commit -m "Add head" &&
		>BODY &&
		git add BODY &&
		git commit -m "Add body"
	) &&

	FAKE_LINES="1 squash 2" git rebase -i to-be-rebased &&
	test "$(git show -s --pretty=format:%an)" = "Squashed Away"

'

test_done
Commit	Line	Data
1b1dce4b JS	1	#!/bin/sh
	2	#
	3	# Copyright (c) 2007 Johannes E. Schindelin
	4	#
	5
	6	test_description='git rebase interactive
	7
	8	This test runs git rebase "interactively", by faking an edit, and verifies
	9	that the result still makes sense.
	10	'
	11	. ./test-lib.sh
	12
	13	# set up two branches like this:
	14	#
	15	# A - B - C - D - E
	16	# \
	17	# F - G - H
	18	# \
	19	# I
	20	#
	21	# where B, D and G touch the same file.
	22
	23	test_expect_success 'setup' '
	24	: > file1 &&
	25	git add file1 &&
	26	test_tick &&
	27	git commit -m A &&
	28	git tag A &&
	29	echo 1 > file1 &&
	30	test_tick &&
	31	git commit -m B file1 &&
	32	: > file2 &&
	33	git add file2 &&
	34	test_tick &&
	35	git commit -m C &&
	36	echo 2 > file1 &&
	37	test_tick &&
	38	git commit -m D file1 &&
	39	: > file3 &&
	40	git add file3 &&
	41	test_tick &&
	42	git commit -m E &&
	43	git checkout -b branch1 A &&
	44	: > file4 &&
	45	git add file4 &&
	46	test_tick &&
	47	git commit -m F &&
	48	git tag F &&
	49	echo 3 > file1 &&
	50	test_tick &&
	51	git commit -m G file1 &&
	52	: > file5 &&
	53	git add file5 &&
	54	test_tick &&
	55	git commit -m H &&
	56	git checkout -b branch2 F &&
	57	: > file6 &&
	58	git add file6 &&
	59	test_tick &&
	60	git commit -m I &&
	61	git tag I
	62	'
	63
7cf7f54a	64	echo "#!$SHELL_PATH" >fake-editor.sh
1bd38e8d	65	cat >> fake-editor.sh <<\EOF
77b258f4 JH	66	case "$1" in
	67	*/COMMIT_EDITMSG)
	68	test -z "$FAKE_COMMIT_MESSAGE" \|\| echo "$FAKE_COMMIT_MESSAGE" > "$1"
	69	test -z "$FAKE_COMMIT_AMEND" \|\| echo "$FAKE_COMMIT_AMEND" >> "$1"
18640d99	70	exit
77b258f4 JH	71	;;
	72	esac
	73	test -z "$EXPECT_COUNT" \|\|
	74	test "$EXPECT_COUNT" = $(sed -e '/^#/d' -e '/^$/d' < "$1" \| wc -l) \|\|
96ffe892	75	exit
77b258f4 JH	76	test -z "$FAKE_LINES" && exit
	77	grep -v '^#' < "$1" > "$1".tmp
	78	rm -f "$1"
	79	cat "$1".tmp
1b1dce4b	80	action=pick
77b258f4 JH	81	for line in $FAKE_LINES; do
77b258f4 JH	82	case $line in
be6ff208	83	squash\|edit)
77b258f4	84	action="$line";;
1b1dce4b	85	*)
77b258f4 JH	86	echo sed -n "${line}s/^pick/$action/p"
	87	sed -n "${line}p" < "$1".tmp
	88	sed -n "${line}s/^pick/$action/p" < "$1".tmp >> "$1"
1b1dce4b JS	89	action=pick;;
	90	esac
	91	done
	92	EOF
	93
f69e836f	94	test_set_editor "$(pwd)/fake-editor.sh"
1b1dce4b	95	chmod a+x fake-editor.sh
1b1dce4b JS	96
	97	test_expect_success 'no changes are a nop' '
	98	git rebase -i F &&
ab736792	99	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
1b1dce4b JS	100	test $(git rev-parse I) = $(git rev-parse HEAD)
	101	'
	102
c9e65892 JS	103	test_expect_success 'test the [branch] option' '
	104	git checkout -b dead-end &&
	105	git rm file6 &&
	106	git commit -m "stop here" &&
	107	git rebase -i F branch2 &&
ab736792 SB	108	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
ab736792 SB	109	test $(git rev-parse I) = $(git rev-parse branch2) &&
c9e65892 JS	110	test $(git rev-parse I) = $(git rev-parse HEAD)
	111	'
	112
ab736792 SB	113	test_expect_success 'test --onto <branch>' '
	114	git checkout -b test-onto branch2 &&
	115	git rebase -i --onto branch1 F &&
	116	test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
	117	test $(git rev-parse HEAD^) = $(git rev-parse branch1) &&
	118	test $(git rev-parse I) = $(git rev-parse branch2)
	119	'
	120
1b1dce4b JS	121	test_expect_success 'rebase on top of a non-conflicting commit' '
	122	git checkout branch1 &&
	123	git tag original-branch1 &&
	124	git rebase -i branch2 &&
	125	test file6 = $(git diff --name-only original-branch1) &&
ab736792 SB	126	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
ab736792 SB	127	test $(git rev-parse I) = $(git rev-parse branch2) &&
1b1dce4b JS	128	test $(git rev-parse I) = $(git rev-parse HEAD~2)
	129	'
	130
68a163c9 JS	131	test_expect_success 'reflog for the branch shows state before rebase' '
	132	test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
	133	'
	134
1b1dce4b JS	135	test_expect_success 'exchange two commits' '
1b1dce4b JS	136	FAKE_LINES="2 1" git rebase -i HEAD~2 &&
b4ce54fc JK	137	test H = $(git cat-file commit HEAD^ \| sed -ne \$p) &&
b4ce54fc JK	138	test G = $(git cat-file commit HEAD \| sed -ne \$p)
1b1dce4b JS	139	'
	140
	141	cat > expect << EOF
	142	diff --git a/file1 b/file1
	143	index e69de29..00750ed 100644
	144	--- a/file1
	145	+++ b/file1
	146	@@ -0,0 +1 @@
	147	+3
	148	EOF
	149
	150	cat > expect2 << EOF
	151	<<<<<<< HEAD:file1
	152	2
	153	=======
	154	3
	155	>>>>>>> b7ca976... G:file1
	156	EOF
	157
	158	test_expect_success 'stop on conflicting pick' '
	159	git tag new-branch1 &&
ab736792 SB	160	test_must_fail git rebase -i master &&
ab736792 SB	161	test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
28ed6e7b	162	test_cmp expect .git/rebase-merge/patch &&
82ebb0b6	163	test_cmp expect2 file1 &&
0cb0e143	164	test "$(git diff --name-status \|
ab736792	165	sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
28ed6e7b JS	166	test 4 = $(grep -v "^#" < .git/rebase-merge/done \| wc -l) &&
28ed6e7b JS	167	test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
1b1dce4b JS	168	'
	169
	170	test_expect_success 'abort' '
	171	git rebase --abort &&
	172	test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
ab736792	173	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
28ed6e7b	174	! test -d .git/rebase-merge
1b1dce4b JS	175	'
	176
	177	test_expect_success 'retain authorship' '
	178	echo A > file7 &&
	179	git add file7 &&
c54b7817	180	test_tick &&
1b1dce4b JS	181	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
	182	git tag twerp &&
	183	git rebase -i --onto master HEAD^ &&
	184	git show HEAD \| grep "^Author: Twerp Snog"
	185	'
	186
	187	test_expect_success 'squash' '
	188	git reset --hard twerp &&
	189	echo B > file7 &&
c54b7817	190	test_tick &&
1b1dce4b JS	191	GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
	192	echo "******************************" &&
	193	FAKE_LINES="1 squash 2" git rebase -i --onto master HEAD~2 &&
	194	test B = $(cat file7) &&
	195	test $(git rev-parse HEAD^) = $(git rev-parse master)
	196	'
	197
	198	test_expect_success 'retain authorship when squashing' '
81ab1cb4	199	git show HEAD \| grep "^Author: Twerp Snog"
1b1dce4b JS	200	'
1b1dce4b JS	201
34454e85 JS	202	test_expect_success '-p handles "no changes" gracefully' '
	203	HEAD=$(git rev-parse HEAD) &&
	204	git rebase -i -p HEAD^ &&
71d9451e TR	205	git update-index --refresh &&
	206	git diff-files --quiet &&
	207	git diff-index --quiet --cached HEAD -- &&
34454e85 JS	208	test $HEAD = $(git rev-parse HEAD)
	209	'
	210
f09c9b8c JS	211	test_expect_success 'preserve merges with -p' '
	212	git checkout -b to-be-preserved master^ &&
	213	: > unrelated-file &&
	214	git add unrelated-file &&
	215	test_tick &&
	216	git commit -m "unrelated" &&
5352a82b	217	git checkout -b another-branch master &&
f09c9b8c JS	218	echo B > file1 &&
	219	test_tick &&
	220	git commit -m J file1 &&
	221	test_tick &&
	222	git merge to-be-preserved &&
	223	echo C > file1 &&
	224	test_tick &&
	225	git commit -m K file1 &&
5352a82b SB	226	echo D > file1 &&
	227	test_tick &&
	228	git commit -m L1 file1 &&
	229	git checkout HEAD^ &&
	230	echo 1 > unrelated-file &&
	231	test_tick &&
	232	git commit -m L2 unrelated-file &&
	233	test_tick &&
	234	git merge another-branch &&
	235	echo E > file1 &&
	236	test_tick &&
	237	git commit -m M file1 &&
	238	git checkout -b to-be-rebased &&
18640d99	239	test_tick &&
f09c9b8c	240	git rebase -i -p --onto branch1 master &&
71d9451e TR	241	git update-index --refresh &&
	242	git diff-files --quiet &&
	243	git diff-index --quiet --cached HEAD -- &&
5352a82b SB	244	test $(git rev-parse HEAD~6) = $(git rev-parse branch1) &&
	245	test $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) &&
	246	test $(git rev-parse HEAD^^2^) = $(git rev-parse HEAD^^^) &&
	247	test $(git show HEAD~5:file1) = B &&
	248	test $(git show HEAD~3:file1) = C &&
	249	test $(git show HEAD:file1) = E &&
	250	test $(git show HEAD:unrelated-file) = 1
f09c9b8c JS	251	'
f09c9b8c JS	252
a96dc01e TR	253	test_expect_success 'edit ancestor with -p' '
	254	FAKE_LINES="1 edit 2 3 4" git rebase -i -p HEAD~3 &&
	255	echo 2 > unrelated-file &&
	256	test_tick &&
	257	git commit -m L2-modified --amend unrelated-file &&
	258	git rebase --continue &&
	259	git update-index --refresh &&
	260	git diff-files --quiet &&
	261	git diff-index --quiet --cached HEAD -- &&
	262	test $(git show HEAD:unrelated-file) = 2
	263	'
	264
18640d99 JS	265	test_expect_success '--continue tries to commit' '
18640d99 JS	266	test_tick &&
ab736792	267	test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
18640d99 JS	268	echo resolved > file1 &&
	269	git add file1 &&
	270	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
	271	test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
	272	git show HEAD \| grep chouette
	273	'
	274
8e4a91bd JS	275	test_expect_success 'verbose flag is heeded, even after --continue' '
	276	git reset --hard HEAD@{1} &&
	277	test_tick &&
ab736792	278	test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
8e4a91bd JS	279	echo resolved > file1 &&
	280	git add file1 &&
	281	git rebase --continue > output &&
	282	grep "^ file1 \| 2 +-$" output
	283	'
	284
6368f3f8 JS	285	test_expect_success 'multi-squash only fires up editor once' '
	286	base=$(git rev-parse HEAD~4) &&
	287	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \
	288	git rebase -i $base &&
	289	test $base = $(git rev-parse HEAD^) &&
	290	test 1 = $(git show \| grep ONCE \| wc -l)
	291	'
	292
fb47cfbd JS	293	test_expect_success 'squash works as expected' '
	294	for n in one two three four
	295	do
	296	echo $n >> file$n &&
	297	git add file$n &&
	298	git commit -m $n
	299	done &&
	300	one=$(git rev-parse HEAD~3) &&
	301	FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
	302	test $one = $(git rev-parse HEAD~2)
	303	'
	304
	305	test_expect_success 'interrupted squash works as expected' '
	306	for n in one two three four
	307	do
	308	echo $n >> conflict &&
	309	git add conflict &&
	310	git commit -m $n
	311	done &&
	312	one=$(git rev-parse HEAD~3) &&
ab736792 SB	313	(
	314	FAKE_LINES="1 squash 3 2" &&
	315	export FAKE_LINES &&
	316	test_must_fail git rebase -i HEAD~3
	317	) &&
fb47cfbd JS	318	(echo one; echo two; echo four) > conflict &&
fb47cfbd JS	319	git add conflict &&
ab736792	320	test_must_fail git rebase --continue &&
fb47cfbd JS	321	echo resolved > conflict &&
	322	git add conflict &&
	323	git rebase --continue &&
	324	test $one = $(git rev-parse HEAD~2)
	325	'
	326
1d25c8cf JS	327	test_expect_success 'interrupted squash works as expected (case 2)' '
	328	for n in one two three four
	329	do
	330	echo $n >> conflict &&
	331	git add conflict &&
	332	git commit -m $n
	333	done &&
	334	one=$(git rev-parse HEAD~3) &&
ab736792 SB	335	(
	336	FAKE_LINES="3 squash 1 2" &&
	337	export FAKE_LINES &&
	338	test_must_fail git rebase -i HEAD~3
	339	) &&
1d25c8cf JS	340	(echo one; echo four) > conflict &&
1d25c8cf JS	341	git add conflict &&
ab736792	342	test_must_fail git rebase --continue &&
1d25c8cf JS	343	(echo one; echo two; echo four) > conflict &&
1d25c8cf JS	344	git add conflict &&
ab736792	345	test_must_fail git rebase --continue &&
1d25c8cf JS	346	echo resolved > conflict &&
	347	git add conflict &&
	348	git rebase --continue &&
	349	test $one = $(git rev-parse HEAD~2)
	350	'
	351
96ffe892 JS	352	test_expect_success 'ignore patch if in upstream' '
	353	HEAD=$(git rev-parse HEAD) &&
	354	git checkout -b has-cherry-picked HEAD^ &&
	355	echo unrelated > file7 &&
	356	git add file7 &&
	357	test_tick &&
	358	git commit -m "unrelated change" &&
	359	git cherry-pick $HEAD &&
	360	EXPECT_COUNT=1 git rebase -i $HEAD &&
	361	test $HEAD = $(git rev-parse HEAD^)
	362	'
	363
be6ff208 JS	364	test_expect_success '--continue tries to commit, even for "edit"' '
	365	parent=$(git rev-parse HEAD^) &&
	366	test_tick &&
	367	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
	368	echo edited > file7 &&
	369	git add file7 &&
	370	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
	371	test edited = $(git show HEAD:file7) &&
	372	git show HEAD \| grep chouette &&
	373	test $parent = $(git rev-parse HEAD^)
	374	'
	375
73697a0b JS	376	test_expect_success 'rebase a detached HEAD' '
	377	grandparent=$(git rev-parse HEAD~2) &&
	378	git checkout $(git rev-parse HEAD) &&
	379	test_tick &&
	380	FAKE_LINES="2 1" git rebase -i HEAD~2 &&
	381	test $grandparent = $(git rev-parse HEAD~2)
	382	'
	383
752527f5 JS	384	test_expect_success 'rebase a commit violating pre-commit' '
	385
	386	mkdir -p .git/hooks &&
	387	PRE_COMMIT=.git/hooks/pre-commit &&
	388	echo "#!/bin/sh" > $PRE_COMMIT &&
	389	echo "test -z \"\$(git diff --cached --check)\"" >> $PRE_COMMIT &&
	390	chmod a+x $PRE_COMMIT &&
	391	echo "monde! " >> file1 &&
	392	test_tick &&
ab736792	393	test_must_fail git commit -m doesnt-verify file1 &&
752527f5 JS	394	git commit -m doesnt-verify --no-verify file1 &&
	395	test_tick &&
	396	FAKE_LINES=2 git rebase -i HEAD~2
	397
	398	'
	399
077b725f JH	400	test_expect_success 'rebase with a file named HEAD in worktree' '
	401
	402	rm -fr .git/hooks &&
	403	git reset --hard &&
	404	git checkout -b branch3 A &&
	405
	406	(
	407	GIT_AUTHOR_NAME="Squashed Away" &&
	408	export GIT_AUTHOR_NAME &&
	409	>HEAD &&
	410	git add HEAD &&
	411	git commit -m "Add head" &&
	412	>BODY &&
	413	git add BODY &&
	414	git commit -m "Add body"
	415	) &&
	416
	417	FAKE_LINES="1 squash 2" git rebase -i to-be-rebased &&
	418	test "$(git show -s --pretty=format:%an)" = "Squashed Away"
	419
	420	'
	421
1b1dce4b	422	test_done