[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
'

cat > fake-editor.sh <<\EOF
#!/bin/sh
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

chmod a+x fake-editor.sh
VISUAL="$(pwd)/fake-editor.sh"
export VISUAL

test_expect_success 'no changes are a nop' '
	git rebase -i F &&
	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 rev-parse I) = $(git rev-parse HEAD)
'

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 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^ | tail -n 1) &&
	test G = $(git cat-file commit HEAD | tail -n 1)
'

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 &&
	! git rebase -i master &&
	diff -u expect .git/.dotest-merge/patch &&
	diff -u expect2 file1 &&
	test 4 = $(grep -v "^#" < .git/.dotest-merge/done | wc -l) &&
	test 0 = $(grep -ve "^#" -e "^$" < .git/.dotest-merge/git-rebase-todo |
		wc -l)
'

test_expect_success 'abort' '
	git rebase --abort &&
	test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
	! test -d .git/.dotest-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^ &&
	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 to-be-rebased 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 &&
	test_tick &&
	git rebase -i -p --onto branch1 master &&
	test $(git rev-parse HEAD^^2) = $(git rev-parse to-be-preserved) &&
	test $(git rev-parse HEAD~3) = $(git rev-parse branch1) &&
	test $(git show HEAD:file1) = C &&
	test $(git show HEAD~2:file1) = B
'

test_expect_success '--continue tries to commit' '
	test_tick &&
	! 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 &&
	! 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" git rebase -i HEAD~3 &&
	(echo one; echo two; echo four) > conflict &&
	git add conflict &&
	! 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" git rebase -i HEAD~3 &&
	(echo one; echo four) > conflict &&
	git add conflict &&
	! git rebase --continue &&
	(echo one; echo two; echo four) > conflict &&
	git add conflict &&
	! 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_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
77b258f4	64	cat > fake-editor.sh <<\EOF
1b1dce4b	65	#!/bin/sh
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
	94	chmod a+x fake-editor.sh
	95	VISUAL="$(pwd)/fake-editor.sh"
	96	export VISUAL
	97
	98	test_expect_success 'no changes are a nop' '
	99	git rebase -i F &&
	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 &&
	108	test $(git rev-parse I) = $(git rev-parse HEAD)
	109	'
	110
1b1dce4b JS	111	test_expect_success 'rebase on top of a non-conflicting commit' '
	112	git checkout branch1 &&
	113	git tag original-branch1 &&
	114	git rebase -i branch2 &&
	115	test file6 = $(git diff --name-only original-branch1) &&
	116	test $(git rev-parse I) = $(git rev-parse HEAD~2)
	117	'
	118
68a163c9 JS	119	test_expect_success 'reflog for the branch shows state before rebase' '
	120	test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
	121	'
	122
1b1dce4b JS	123	test_expect_success 'exchange two commits' '
	124	FAKE_LINES="2 1" git rebase -i HEAD~2 &&
	125	test H = $(git cat-file commit HEAD^ \| tail -n 1) &&
	126	test G = $(git cat-file commit HEAD \| tail -n 1)
	127	'
	128
	129	cat > expect << EOF
	130	diff --git a/file1 b/file1
	131	index e69de29..00750ed 100644
	132	--- a/file1
	133	+++ b/file1
	134	@@ -0,0 +1 @@
	135	+3
	136	EOF
	137
	138	cat > expect2 << EOF
	139	<<<<<<< HEAD:file1
	140	2
	141	=======
	142	3
	143	>>>>>>> b7ca976... G:file1
	144	EOF
	145
	146	test_expect_success 'stop on conflicting pick' '
	147	git tag new-branch1 &&
	148	! git rebase -i master &&
	149	diff -u expect .git/.dotest-merge/patch &&
	150	diff -u expect2 file1 &&
	151	test 4 = $(grep -v "^#" < .git/.dotest-merge/done \| wc -l) &&
6047a234 JS	152	test 0 = $(grep -ve "^#" -e "^$" < .git/.dotest-merge/git-rebase-todo \|
6047a234 JS	153	wc -l)
1b1dce4b JS	154	'
	155
	156	test_expect_success 'abort' '
	157	git rebase --abort &&
	158	test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
	159	! test -d .git/.dotest-merge
	160	'
	161
	162	test_expect_success 'retain authorship' '
	163	echo A > file7 &&
	164	git add file7 &&
c54b7817	165	test_tick &&
1b1dce4b JS	166	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
	167	git tag twerp &&
	168	git rebase -i --onto master HEAD^ &&
	169	git show HEAD \| grep "^Author: Twerp Snog"
	170	'
	171
	172	test_expect_success 'squash' '
	173	git reset --hard twerp &&
	174	echo B > file7 &&
c54b7817	175	test_tick &&
1b1dce4b JS	176	GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
	177	echo "******************************" &&
	178	FAKE_LINES="1 squash 2" git rebase -i --onto master HEAD~2 &&
	179	test B = $(cat file7) &&
	180	test $(git rev-parse HEAD^) = $(git rev-parse master)
	181	'
	182
	183	test_expect_success 'retain authorship when squashing' '
81ab1cb4	184	git show HEAD \| grep "^Author: Twerp Snog"
1b1dce4b JS	185	'
1b1dce4b JS	186
34454e85 JS	187	test_expect_success '-p handles "no changes" gracefully' '
	188	HEAD=$(git rev-parse HEAD) &&
	189	git rebase -i -p HEAD^ &&
	190	test $HEAD = $(git rev-parse HEAD)
	191	'
	192
f09c9b8c JS	193	test_expect_success 'preserve merges with -p' '
	194	git checkout -b to-be-preserved master^ &&
	195	: > unrelated-file &&
	196	git add unrelated-file &&
	197	test_tick &&
	198	git commit -m "unrelated" &&
	199	git checkout -b to-be-rebased master &&
	200	echo B > file1 &&
	201	test_tick &&
	202	git commit -m J file1 &&
	203	test_tick &&
	204	git merge to-be-preserved &&
	205	echo C > file1 &&
	206	test_tick &&
	207	git commit -m K file1 &&
18640d99	208	test_tick &&
f09c9b8c JS	209	git rebase -i -p --onto branch1 master &&
	210	test $(git rev-parse HEAD^^2) = $(git rev-parse to-be-preserved) &&
	211	test $(git rev-parse HEAD~3) = $(git rev-parse branch1) &&
	212	test $(git show HEAD:file1) = C &&
	213	test $(git show HEAD~2:file1) = B
	214	'
	215
18640d99 JS	216	test_expect_success '--continue tries to commit' '
	217	test_tick &&
	218	! git rebase -i --onto new-branch1 HEAD^ &&
	219	echo resolved > file1 &&
	220	git add file1 &&
	221	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
	222	test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
	223	git show HEAD \| grep chouette
	224	'
	225
8e4a91bd JS	226	test_expect_success 'verbose flag is heeded, even after --continue' '
	227	git reset --hard HEAD@{1} &&
	228	test_tick &&
	229	! git rebase -v -i --onto new-branch1 HEAD^ &&
	230	echo resolved > file1 &&
	231	git add file1 &&
	232	git rebase --continue > output &&
	233	grep "^ file1 \| 2 +-$" output
	234	'
	235
6368f3f8 JS	236	test_expect_success 'multi-squash only fires up editor once' '
	237	base=$(git rev-parse HEAD~4) &&
	238	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \
	239	git rebase -i $base &&
	240	test $base = $(git rev-parse HEAD^) &&
	241	test 1 = $(git show \| grep ONCE \| wc -l)
	242	'
	243
fb47cfbd JS	244	test_expect_success 'squash works as expected' '
	245	for n in one two three four
	246	do
	247	echo $n >> file$n &&
	248	git add file$n &&
	249	git commit -m $n
	250	done &&
	251	one=$(git rev-parse HEAD~3) &&
	252	FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
	253	test $one = $(git rev-parse HEAD~2)
	254	'
	255
	256	test_expect_success 'interrupted squash works as expected' '
	257	for n in one two three four
	258	do
	259	echo $n >> conflict &&
	260	git add conflict &&
	261	git commit -m $n
	262	done &&
	263	one=$(git rev-parse HEAD~3) &&
	264	! FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
	265	(echo one; echo two; echo four) > conflict &&
	266	git add conflict &&
	267	! git rebase --continue &&
	268	echo resolved > conflict &&
	269	git add conflict &&
	270	git rebase --continue &&
	271	test $one = $(git rev-parse HEAD~2)
	272	'
	273
1d25c8cf JS	274	test_expect_success 'interrupted squash works as expected (case 2)' '
	275	for n in one two three four
	276	do
	277	echo $n >> conflict &&
	278	git add conflict &&
	279	git commit -m $n
	280	done &&
	281	one=$(git rev-parse HEAD~3) &&
	282	! FAKE_LINES="3 squash 1 2" git rebase -i HEAD~3 &&
	283	(echo one; echo four) > conflict &&
	284	git add conflict &&
	285	! git rebase --continue &&
	286	(echo one; echo two; echo four) > conflict &&
	287	git add conflict &&
	288	! git rebase --continue &&
	289	echo resolved > conflict &&
	290	git add conflict &&
	291	git rebase --continue &&
	292	test $one = $(git rev-parse HEAD~2)
	293	'
	294
96ffe892 JS	295	test_expect_success 'ignore patch if in upstream' '
	296	HEAD=$(git rev-parse HEAD) &&
	297	git checkout -b has-cherry-picked HEAD^ &&
	298	echo unrelated > file7 &&
	299	git add file7 &&
	300	test_tick &&
	301	git commit -m "unrelated change" &&
	302	git cherry-pick $HEAD &&
	303	EXPECT_COUNT=1 git rebase -i $HEAD &&
	304	test $HEAD = $(git rev-parse HEAD^)
	305	'
	306
be6ff208 JS	307	test_expect_success '--continue tries to commit, even for "edit"' '
	308	parent=$(git rev-parse HEAD^) &&
	309	test_tick &&
	310	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
	311	echo edited > file7 &&
	312	git add file7 &&
	313	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
	314	test edited = $(git show HEAD:file7) &&
	315	git show HEAD \| grep chouette &&
	316	test $parent = $(git rev-parse HEAD^)
	317	'
	318
73697a0b JS	319	test_expect_success 'rebase a detached HEAD' '
	320	grandparent=$(git rev-parse HEAD~2) &&
	321	git checkout $(git rev-parse HEAD) &&
	322	test_tick &&
	323	FAKE_LINES="2 1" git rebase -i HEAD~2 &&
	324	test $grandparent = $(git rev-parse HEAD~2)
	325	'
	326
1b1dce4b	327	test_done