[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

. "$TEST_DIRECTORY"/lib-rebase.sh

set_fake_editor

# Set up the repository like this:
#
#     one - two - three - four (conflict-branch)
#   /
# A - B - C - D - E            (master)
# | \
# |   F - G - H                (branch1)
# |     \
#  \      I                    (branch2)
#   \
#     J - K - L - M            (no-conflict-branch)
#
# where A, B, D and G all touch file1, and one, two, three, four all
# touch file "conflict".

test_expect_success 'setup' '
	test_commit A file1 &&
	test_commit B file1 &&
	test_commit C file2 &&
	test_commit D file1 &&
	test_commit E file3 &&
	git checkout -b branch1 A &&
	test_commit F file4 &&
	test_commit G file1 &&
	test_commit H file5 &&
	git checkout -b branch2 F &&
	test_commit I file6
	git checkout -b conflict-branch A &&
	for n in one two three four
	do
		test_commit $n conflict
	done &&
	git checkout -b no-conflict-branch A &&
	for n in J K L M
	do
		test_commit $n file$n
	done
'

test_expect_success 'no changes are a nop' '
	git checkout branch2 &&
	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 f70f10e..fd79235 100644
--- a/file1
+++ b/file1
@@ -1 +1 @@
-A
+G
EOF

cat > expect2 << EOF
<<<<<<< HEAD
D
=======
G
>>>>>>> 51047de... G
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" EXPECT_HEADER_COUNT=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" \
		EXPECT_HEADER_COUNT=4 \
		git rebase -i $base &&
	test $base = $(git rev-parse HEAD^) &&
	test 1 = $(git show | grep ONCE | wc -l)
'

test_expect_success 'multi-fixup does not fire up editor' '
	git checkout -b multi-fixup E &&
	base=$(git rev-parse HEAD~4) &&
	FAKE_COMMIT_AMEND="NEVER" FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \
		git rebase -i $base &&
	test $base = $(git rev-parse HEAD^) &&
	test 0 = $(git show | grep NEVER | wc -l) &&
	git checkout to-be-rebased &&
	git branch -D multi-fixup
'

test_expect_success 'commit message used after conflict' '
	git checkout -b conflict-fixup conflict-branch &&
	base=$(git rev-parse HEAD~4) &&
	(
		FAKE_LINES="1 fixup 3 fixup 4" &&
		export FAKE_LINES &&
		test_must_fail git rebase -i $base
	) &&
	echo three > conflict &&
	git add conflict &&
	FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
		git rebase --continue &&
	test $base = $(git rev-parse HEAD^) &&
	test 1 = $(git show | grep ONCE | wc -l) &&
	git checkout to-be-rebased &&
	git branch -D conflict-fixup
'

test_expect_success 'commit message retained after conflict' '
	git checkout -b conflict-squash conflict-branch &&
	base=$(git rev-parse HEAD~4) &&
	(
		FAKE_LINES="1 fixup 3 squash 4" &&
		export FAKE_LINES &&
		test_must_fail git rebase -i $base
	) &&
	echo three > conflict &&
	git add conflict &&
	FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
		git rebase --continue &&
	test $base = $(git rev-parse HEAD^) &&
	test 2 = $(git show | grep TWICE | wc -l) &&
	git checkout to-be-rebased &&
	git branch -D conflict-squash
'

cat > expect-squash-fixup << EOF
B

D

ONCE
EOF

test_expect_success 'squash and fixup generate correct log messages' '
	git checkout -b squash-fixup E &&
	base=$(git rev-parse HEAD~4) &&
	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 fixup 2 squash 3 fixup 4" \
		EXPECT_HEADER_COUNT=4 \
		git rebase -i $base &&
	git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup &&
	test_cmp expect-squash-fixup actual-squash-fixup &&
	git checkout to-be-rebased &&
	git branch -D squash-fixup
'

test_expect_success 'squash ignores comments' '
	git checkout -b skip-comments E &&
	base=$(git rev-parse HEAD~4) &&
	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \
		EXPECT_HEADER_COUNT=4 \
		git rebase -i $base &&
	test $base = $(git rev-parse HEAD^) &&
	test 1 = $(git show | grep ONCE | wc -l) &&
	git checkout to-be-rebased &&
	git branch -D skip-comments
'

test_expect_success 'squash ignores blank lines' '
	git checkout -b skip-blank-lines E &&
	base=$(git rev-parse HEAD~4) &&
	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \
		EXPECT_HEADER_COUNT=4 \
		git rebase -i $base &&
	test $base = $(git rev-parse HEAD^) &&
	test 1 = $(git show | grep ONCE | wc -l) &&
	git checkout to-be-rebased &&
	git branch -D skip-blank-lines
'

test_expect_success 'squash works as expected' '
	git checkout -b squash-works no-conflict-branch &&
	one=$(git rev-parse HEAD~3) &&
	FAKE_LINES="1 squash 3 2" EXPECT_HEADER_COUNT=2 \
		git rebase -i HEAD~3 &&
	test $one = $(git rev-parse HEAD~2)
'

test_expect_success 'interrupted squash works as expected' '
	git checkout -b interrupted-squash conflict-branch &&
	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)' '
	git checkout -b interrupted-squash2 conflict-branch &&
	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 'aborted --continue does not squash commits after "edit"' '
	old=$(git rev-parse HEAD) &&
	test_tick &&
	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
	echo "edited again" > file7 &&
	git add file7 &&
	(
		FAKE_COMMIT_MESSAGE=" " &&
		export FAKE_COMMIT_MESSAGE &&
		test_must_fail git rebase --continue
	) &&
	test $old = $(git rev-parse HEAD) &&
	git rebase --abort
'

test_expect_success 'auto-amend only edited commits after "edit"' '
	test_tick &&
	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
	echo "edited again" > file7 &&
	git add file7 &&
	FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
	echo "and again" > file7 &&
	git add file7 &&
	test_tick &&
	(
		FAKE_COMMIT_MESSAGE="and again" &&
		export FAKE_COMMIT_MESSAGE &&
		test_must_fail git rebase --continue
	) &&
	git rebase --abort
'

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_expect_success 'do "noop" when there is nothing to cherry-pick' '

	git checkout -b branch4 HEAD &&
	GIT_EDITOR=: git commit --amend \
		--author="Somebody else <somebody@else.com>" 
	test $(git rev-parse branch3) != $(git rev-parse branch4) &&
	git rebase -i branch3 &&
	test $(git rev-parse branch3) = $(git rev-parse branch4)

'

test_expect_success 'submodule rebase setup' '
	git checkout A &&
	mkdir sub &&
	(
		cd sub && git init && >elif &&
		git add elif && git commit -m "submodule initial"
	) &&
	echo 1 >file1 &&
	git add file1 sub
	test_tick &&
	git commit -m "One" &&
	echo 2 >file1 &&
	test_tick &&
	git commit -a -m "Two" &&
	(
		cd sub && echo 3 >elif &&
		git commit -a -m "submodule second"
	) &&
	test_tick &&
	git commit -a -m "Three changes submodule"
'

test_expect_success 'submodule rebase -i' '
	FAKE_LINES="1 squash 2 3" git rebase -i A
'

test_expect_success 'avoid unnecessary reset' '
	git checkout master &&
	test-chmtime =123456789 file3 &&
	git update-index --refresh &&
	HEAD=$(git rev-parse HEAD) &&
	git rebase -i HEAD~4 &&
	test $HEAD = $(git rev-parse HEAD) &&
	MTIME=$(test-chmtime -v +0 file3 | sed 's/[^0-9].*$//') &&
	test 123456789 = $MTIME
'

test_expect_success 'reword' '
	git checkout -b reword-branch master &&
	FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" git rebase -i A &&
	git show HEAD | grep "E changed" &&
	test $(git rev-parse master) != $(git rev-parse HEAD) &&
	test $(git rev-parse master^) = $(git rev-parse HEAD^) &&
	FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" git rebase -i A &&
	git show HEAD^ | grep "D changed" &&
	FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" git rebase -i A &&
	git show HEAD~3 | grep "B changed" &&
	FAKE_LINES="1 reword 2 3 4" FAKE_COMMIT_MESSAGE="C changed" git rebase -i A &&
	git show HEAD~2 | grep "C changed"
'

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
eaf0551d	13	. "$TEST_DIRECTORY"/lib-rebase.sh
29a03348 JS	14
	15	set_fake_editor
	16
6c4c44c4	17	# Set up the repository like this:
1b1dce4b	18	#
6c4c44c4 MH	19	# one - two - three - four (conflict-branch)
	20	# /
	21	# A - B - C - D - E (master)
	22	# \| \
	23	# \| F - G - H (branch1)
	24	# \| \
	25	# \ I (branch2)
1b1dce4b	26	# \
6c4c44c4	27	# J - K - L - M (no-conflict-branch)
1b1dce4b	28	#
6c4c44c4 MH	29	# where A, B, D and G all touch file1, and one, two, three, four all
6c4c44c4 MH	30	# touch file "conflict".
1b1dce4b JS	31
1b1dce4b JS	32	test_expect_success 'setup' '
163f3925 MH	33	test_commit A file1 &&
	34	test_commit B file1 &&
	35	test_commit C file2 &&
	36	test_commit D file1 &&
	37	test_commit E file3 &&
1b1dce4b	38	git checkout -b branch1 A &&
163f3925 MH	39	test_commit F file4 &&
	40	test_commit G file1 &&
	41	test_commit H file5 &&
1b1dce4b	42	git checkout -b branch2 F &&
163f3925	43	test_commit I file6
6c4c44c4 MH	44	git checkout -b conflict-branch A &&
	45	for n in one two three four
	46	do
	47	test_commit $n conflict
	48	done &&
	49	git checkout -b no-conflict-branch A &&
	50	for n in J K L M
	51	do
	52	test_commit $n file$n
	53	done
1b1dce4b JS	54	'
1b1dce4b JS	55
1b1dce4b	56	test_expect_success 'no changes are a nop' '
6c4c44c4	57	git checkout branch2 &&
1b1dce4b	58	git rebase -i F &&
ab736792	59	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
1b1dce4b JS	60	test $(git rev-parse I) = $(git rev-parse HEAD)
	61	'
	62
c9e65892 JS	63	test_expect_success 'test the [branch] option' '
	64	git checkout -b dead-end &&
	65	git rm file6 &&
	66	git commit -m "stop here" &&
	67	git rebase -i F branch2 &&
ab736792 SB	68	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
ab736792 SB	69	test $(git rev-parse I) = $(git rev-parse branch2) &&
c9e65892 JS	70	test $(git rev-parse I) = $(git rev-parse HEAD)
	71	'
	72
ab736792 SB	73	test_expect_success 'test --onto <branch>' '
	74	git checkout -b test-onto branch2 &&
	75	git rebase -i --onto branch1 F &&
	76	test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
	77	test $(git rev-parse HEAD^) = $(git rev-parse branch1) &&
	78	test $(git rev-parse I) = $(git rev-parse branch2)
	79	'
	80
1b1dce4b JS	81	test_expect_success 'rebase on top of a non-conflicting commit' '
	82	git checkout branch1 &&
	83	git tag original-branch1 &&
	84	git rebase -i branch2 &&
	85	test file6 = $(git diff --name-only original-branch1) &&
ab736792 SB	86	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
ab736792 SB	87	test $(git rev-parse I) = $(git rev-parse branch2) &&
1b1dce4b JS	88	test $(git rev-parse I) = $(git rev-parse HEAD~2)
	89	'
	90
68a163c9 JS	91	test_expect_success 'reflog for the branch shows state before rebase' '
	92	test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
	93	'
	94
1b1dce4b JS	95	test_expect_success 'exchange two commits' '
1b1dce4b JS	96	FAKE_LINES="2 1" git rebase -i HEAD~2 &&
b4ce54fc JK	97	test H = $(git cat-file commit HEAD^ \| sed -ne \$p) &&
b4ce54fc JK	98	test G = $(git cat-file commit HEAD \| sed -ne \$p)
1b1dce4b JS	99	'
	100
	101	cat > expect << EOF
	102	diff --git a/file1 b/file1
163f3925	103	index f70f10e..fd79235 100644
1b1dce4b JS	104	--- a/file1
1b1dce4b JS	105	+++ b/file1
163f3925 MH	106	@@ -1 +1 @@
	107	-A
	108	+G
1b1dce4b JS	109	EOF
	110
	111	cat > expect2 << EOF
606475f3	112	<<<<<<< HEAD
163f3925	113	D
1b1dce4b	114	=======
163f3925	115	G
6c4c44c4	116	>>>>>>> 51047de... G
1b1dce4b JS	117	EOF
	118
	119	test_expect_success 'stop on conflicting pick' '
	120	git tag new-branch1 &&
ab736792 SB	121	test_must_fail git rebase -i master &&
ab736792 SB	122	test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
28ed6e7b	123	test_cmp expect .git/rebase-merge/patch &&
82ebb0b6	124	test_cmp expect2 file1 &&
0cb0e143	125	test "$(git diff --name-status \|
ab736792	126	sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
28ed6e7b JS	127	test 4 = $(grep -v "^#" < .git/rebase-merge/done \| wc -l) &&
28ed6e7b JS	128	test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
1b1dce4b JS	129	'
	130
	131	test_expect_success 'abort' '
	132	git rebase --abort &&
	133	test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
ab736792	134	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
28ed6e7b	135	! test -d .git/rebase-merge
1b1dce4b JS	136	'
	137
	138	test_expect_success 'retain authorship' '
	139	echo A > file7 &&
	140	git add file7 &&
c54b7817	141	test_tick &&
1b1dce4b JS	142	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
	143	git tag twerp &&
	144	git rebase -i --onto master HEAD^ &&
	145	git show HEAD \| grep "^Author: Twerp Snog"
	146	'
	147
	148	test_expect_success 'squash' '
	149	git reset --hard twerp &&
	150	echo B > file7 &&
c54b7817	151	test_tick &&
1b1dce4b JS	152	GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
1b1dce4b JS	153	echo "******************************" &&
5065ed29	154	FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \
959c0d06	155	git rebase -i --onto master HEAD~2 &&
1b1dce4b JS	156	test B = $(cat file7) &&
	157	test $(git rev-parse HEAD^) = $(git rev-parse master)
	158	'
	159
	160	test_expect_success 'retain authorship when squashing' '
81ab1cb4	161	git show HEAD \| grep "^Author: Twerp Snog"
1b1dce4b JS	162	'
1b1dce4b JS	163
34454e85 JS	164	test_expect_success '-p handles "no changes" gracefully' '
	165	HEAD=$(git rev-parse HEAD) &&
	166	git rebase -i -p HEAD^ &&
71d9451e TR	167	git update-index --refresh &&
	168	git diff-files --quiet &&
	169	git diff-index --quiet --cached HEAD -- &&
34454e85 JS	170	test $HEAD = $(git rev-parse HEAD)
	171	'
	172
f09c9b8c JS	173	test_expect_success 'preserve merges with -p' '
	174	git checkout -b to-be-preserved master^ &&
	175	: > unrelated-file &&
	176	git add unrelated-file &&
	177	test_tick &&
	178	git commit -m "unrelated" &&
5352a82b	179	git checkout -b another-branch master &&
f09c9b8c JS	180	echo B > file1 &&
	181	test_tick &&
	182	git commit -m J file1 &&
	183	test_tick &&
	184	git merge to-be-preserved &&
	185	echo C > file1 &&
	186	test_tick &&
	187	git commit -m K file1 &&
5352a82b SB	188	echo D > file1 &&
	189	test_tick &&
	190	git commit -m L1 file1 &&
	191	git checkout HEAD^ &&
	192	echo 1 > unrelated-file &&
	193	test_tick &&
	194	git commit -m L2 unrelated-file &&
	195	test_tick &&
	196	git merge another-branch &&
	197	echo E > file1 &&
	198	test_tick &&
	199	git commit -m M file1 &&
	200	git checkout -b to-be-rebased &&
18640d99	201	test_tick &&
f09c9b8c	202	git rebase -i -p --onto branch1 master &&
71d9451e TR	203	git update-index --refresh &&
	204	git diff-files --quiet &&
	205	git diff-index --quiet --cached HEAD -- &&
5352a82b SB	206	test $(git rev-parse HEAD~6) = $(git rev-parse branch1) &&
	207	test $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) &&
	208	test $(git rev-parse HEAD^^2^) = $(git rev-parse HEAD^^^) &&
	209	test $(git show HEAD~5:file1) = B &&
	210	test $(git show HEAD~3:file1) = C &&
	211	test $(git show HEAD:file1) = E &&
	212	test $(git show HEAD:unrelated-file) = 1
f09c9b8c JS	213	'
f09c9b8c JS	214
a96dc01e TR	215	test_expect_success 'edit ancestor with -p' '
	216	FAKE_LINES="1 edit 2 3 4" git rebase -i -p HEAD~3 &&
	217	echo 2 > unrelated-file &&
	218	test_tick &&
	219	git commit -m L2-modified --amend unrelated-file &&
	220	git rebase --continue &&
	221	git update-index --refresh &&
	222	git diff-files --quiet &&
	223	git diff-index --quiet --cached HEAD -- &&
	224	test $(git show HEAD:unrelated-file) = 2
	225	'
	226
18640d99 JS	227	test_expect_success '--continue tries to commit' '
18640d99 JS	228	test_tick &&
ab736792	229	test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
18640d99 JS	230	echo resolved > file1 &&
	231	git add file1 &&
	232	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
	233	test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
	234	git show HEAD \| grep chouette
	235	'
	236
8e4a91bd JS	237	test_expect_success 'verbose flag is heeded, even after --continue' '
	238	git reset --hard HEAD@{1} &&
	239	test_tick &&
ab736792	240	test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
8e4a91bd JS	241	echo resolved > file1 &&
	242	git add file1 &&
	243	git rebase --continue > output &&
	244	grep "^ file1 \| 2 +-$" output
	245	'
	246
6368f3f8 JS	247	test_expect_success 'multi-squash only fires up editor once' '
	248	base=$(git rev-parse HEAD~4) &&
	249	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \
959c0d06	250	EXPECT_HEADER_COUNT=4 \
6368f3f8 JS	251	git rebase -i $base &&
	252	test $base = $(git rev-parse HEAD^) &&
	253	test 1 = $(git show \| grep ONCE \| wc -l)
	254	'
	255
a25eb139	256	test_expect_success 'multi-fixup does not fire up editor' '
0205e72f MH	257	git checkout -b multi-fixup E &&
0205e72f MH	258	base=$(git rev-parse HEAD~4) &&
a25eb139	259	FAKE_COMMIT_AMEND="NEVER" FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \
0205e72f MH	260	git rebase -i $base &&
0205e72f MH	261	test $base = $(git rev-parse HEAD^) &&
a25eb139	262	test 0 = $(git show \| grep NEVER \| wc -l) &&
0205e72f MH	263	git checkout to-be-rebased &&
	264	git branch -D multi-fixup
	265	'
	266
6bdcd0d2 MH	267	test_expect_success 'commit message used after conflict' '
	268	git checkout -b conflict-fixup conflict-branch &&
	269	base=$(git rev-parse HEAD~4) &&
	270	(
	271	FAKE_LINES="1 fixup 3 fixup 4" &&
	272	export FAKE_LINES &&
	273	test_must_fail git rebase -i $base
	274	) &&
	275	echo three > conflict &&
	276	git add conflict &&
	277	FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
	278	git rebase --continue &&
	279	test $base = $(git rev-parse HEAD^) &&
	280	test 1 = $(git show \| grep ONCE \| wc -l) &&
	281	git checkout to-be-rebased &&
	282	git branch -D conflict-fixup
	283	'
	284
	285	test_expect_success 'commit message retained after conflict' '
	286	git checkout -b conflict-squash conflict-branch &&
	287	base=$(git rev-parse HEAD~4) &&
	288	(
	289	FAKE_LINES="1 fixup 3 squash 4" &&
	290	export FAKE_LINES &&
	291	test_must_fail git rebase -i $base
	292	) &&
	293	echo three > conflict &&
	294	git add conflict &&
	295	FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
	296	git rebase --continue &&
	297	test $base = $(git rev-parse HEAD^) &&
	298	test 2 = $(git show \| grep TWICE \| wc -l) &&
	299	git checkout to-be-rebased &&
	300	git branch -D conflict-squash
	301	'
	302
0205e72f MH	303	cat > expect-squash-fixup << EOF
	304	B
	305
	306	D
	307
	308	ONCE
	309	EOF
	310
	311	test_expect_success 'squash and fixup generate correct log messages' '
	312	git checkout -b squash-fixup E &&
	313	base=$(git rev-parse HEAD~4) &&
	314	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 fixup 2 squash 3 fixup 4" \
959c0d06	315	EXPECT_HEADER_COUNT=4 \
0205e72f MH	316	git rebase -i $base &&
	317	git cat-file commit HEAD \| sed -e 1,/^\$/d > actual-squash-fixup &&
	318	test_cmp expect-squash-fixup actual-squash-fixup &&
	319	git checkout to-be-rebased &&
	320	git branch -D squash-fixup
	321	'
	322
234b3dae MH	323	test_expect_success 'squash ignores comments' '
	324	git checkout -b skip-comments E &&
	325	base=$(git rev-parse HEAD~4) &&
	326	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \
	327	EXPECT_HEADER_COUNT=4 \
	328	git rebase -i $base &&
	329	test $base = $(git rev-parse HEAD^) &&
	330	test 1 = $(git show \| grep ONCE \| wc -l) &&
	331	git checkout to-be-rebased &&
	332	git branch -D skip-comments
	333	'
	334
	335	test_expect_success 'squash ignores blank lines' '
	336	git checkout -b skip-blank-lines E &&
	337	base=$(git rev-parse HEAD~4) &&
	338	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \
	339	EXPECT_HEADER_COUNT=4 \
	340	git rebase -i $base &&
	341	test $base = $(git rev-parse HEAD^) &&
	342	test 1 = $(git show \| grep ONCE \| wc -l) &&
	343	git checkout to-be-rebased &&
	344	git branch -D skip-blank-lines
	345	'
	346
fb47cfbd	347	test_expect_success 'squash works as expected' '
6c4c44c4	348	git checkout -b squash-works no-conflict-branch &&
fb47cfbd	349	one=$(git rev-parse HEAD~3) &&
5065ed29	350	FAKE_LINES="1 squash 3 2" EXPECT_HEADER_COUNT=2 \
959c0d06	351	git rebase -i HEAD~3 &&
fb47cfbd JS	352	test $one = $(git rev-parse HEAD~2)
	353	'
	354
	355	test_expect_success 'interrupted squash works as expected' '
6c4c44c4	356	git checkout -b interrupted-squash conflict-branch &&
fb47cfbd	357	one=$(git rev-parse HEAD~3) &&
ab736792 SB	358	(
	359	FAKE_LINES="1 squash 3 2" &&
	360	export FAKE_LINES &&
	361	test_must_fail git rebase -i HEAD~3
	362	) &&
fb47cfbd JS	363	(echo one; echo two; echo four) > conflict &&
fb47cfbd JS	364	git add conflict &&
ab736792	365	test_must_fail git rebase --continue &&
fb47cfbd JS	366	echo resolved > conflict &&
	367	git add conflict &&
	368	git rebase --continue &&
	369	test $one = $(git rev-parse HEAD~2)
	370	'
	371
1d25c8cf	372	test_expect_success 'interrupted squash works as expected (case 2)' '
6c4c44c4	373	git checkout -b interrupted-squash2 conflict-branch &&
1d25c8cf	374	one=$(git rev-parse HEAD~3) &&
ab736792 SB	375	(
	376	FAKE_LINES="3 squash 1 2" &&
	377	export FAKE_LINES &&
	378	test_must_fail git rebase -i HEAD~3
	379	) &&
1d25c8cf JS	380	(echo one; echo four) > conflict &&
1d25c8cf JS	381	git add conflict &&
ab736792	382	test_must_fail git rebase --continue &&
1d25c8cf JS	383	(echo one; echo two; echo four) > conflict &&
1d25c8cf JS	384	git add conflict &&
ab736792	385	test_must_fail git rebase --continue &&
1d25c8cf JS	386	echo resolved > conflict &&
	387	git add conflict &&
	388	git rebase --continue &&
	389	test $one = $(git rev-parse HEAD~2)
	390	'
	391
96ffe892 JS	392	test_expect_success 'ignore patch if in upstream' '
	393	HEAD=$(git rev-parse HEAD) &&
	394	git checkout -b has-cherry-picked HEAD^ &&
	395	echo unrelated > file7 &&
	396	git add file7 &&
	397	test_tick &&
	398	git commit -m "unrelated change" &&
	399	git cherry-pick $HEAD &&
	400	EXPECT_COUNT=1 git rebase -i $HEAD &&
	401	test $HEAD = $(git rev-parse HEAD^)
	402	'
	403
be6ff208 JS	404	test_expect_success '--continue tries to commit, even for "edit"' '
	405	parent=$(git rev-parse HEAD^) &&
	406	test_tick &&
	407	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
	408	echo edited > file7 &&
	409	git add file7 &&
	410	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
	411	test edited = $(git show HEAD:file7) &&
	412	git show HEAD \| grep chouette &&
	413	test $parent = $(git rev-parse HEAD^)
	414	'
	415
dc7f55cb SB	416	test_expect_success 'aborted --continue does not squash commits after "edit"' '
	417	old=$(git rev-parse HEAD) &&
	418	test_tick &&
	419	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
	420	echo "edited again" > file7 &&
	421	git add file7 &&
	422	(
	423	FAKE_COMMIT_MESSAGE=" " &&
	424	export FAKE_COMMIT_MESSAGE &&
	425	test_must_fail git rebase --continue
	426	) &&
	427	test $old = $(git rev-parse HEAD) &&
	428	git rebase --abort
	429	'
	430
f8aa1b69 SB	431	test_expect_success 'auto-amend only edited commits after "edit"' '
	432	test_tick &&
	433	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
	434	echo "edited again" > file7 &&
	435	git add file7 &&
	436	FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
	437	echo "and again" > file7 &&
	438	git add file7 &&
	439	test_tick &&
	440	(
	441	FAKE_COMMIT_MESSAGE="and again" &&
	442	export FAKE_COMMIT_MESSAGE &&
	443	test_must_fail git rebase --continue
	444	) &&
	445	git rebase --abort
	446	'
	447
73697a0b JS	448	test_expect_success 'rebase a detached HEAD' '
	449	grandparent=$(git rev-parse HEAD~2) &&
	450	git checkout $(git rev-parse HEAD) &&
	451	test_tick &&
	452	FAKE_LINES="2 1" git rebase -i HEAD~2 &&
	453	test $grandparent = $(git rev-parse HEAD~2)
	454	'
	455
752527f5 JS	456	test_expect_success 'rebase a commit violating pre-commit' '
	457
	458	mkdir -p .git/hooks &&
	459	PRE_COMMIT=.git/hooks/pre-commit &&
	460	echo "#!/bin/sh" > $PRE_COMMIT &&
	461	echo "test -z \"\$(git diff --cached --check)\"" >> $PRE_COMMIT &&
	462	chmod a+x $PRE_COMMIT &&
	463	echo "monde! " >> file1 &&
	464	test_tick &&
ab736792	465	test_must_fail git commit -m doesnt-verify file1 &&
752527f5 JS	466	git commit -m doesnt-verify --no-verify file1 &&
	467	test_tick &&
	468	FAKE_LINES=2 git rebase -i HEAD~2
	469
	470	'
	471
077b725f JH	472	test_expect_success 'rebase with a file named HEAD in worktree' '
	473
	474	rm -fr .git/hooks &&
	475	git reset --hard &&
	476	git checkout -b branch3 A &&
	477
	478	(
	479	GIT_AUTHOR_NAME="Squashed Away" &&
	480	export GIT_AUTHOR_NAME &&
	481	>HEAD &&
	482	git add HEAD &&
	483	git commit -m "Add head" &&
	484	>BODY &&
	485	git add BODY &&
	486	git commit -m "Add body"
	487	) &&
	488
	489	FAKE_LINES="1 squash 2" git rebase -i to-be-rebased &&
	490	test "$(git show -s --pretty=format:%an)" = "Squashed Away"
	491
	492	'
	493
ff74126c JS	494	test_expect_success 'do "noop" when there is nothing to cherry-pick' '
	495
	496	git checkout -b branch4 HEAD &&
	497	GIT_EDITOR=: git commit --amend \
	498	--author="Somebody else <somebody@else.com>"
	499	test $(git rev-parse branch3) != $(git rev-parse branch4) &&
	500	git rebase -i branch3 &&
	501	test $(git rev-parse branch3) = $(git rev-parse branch4)
	502
	503	'
	504
96747696 JH	505	test_expect_success 'submodule rebase setup' '
	506	git checkout A &&
	507	mkdir sub &&
	508	(
	509	cd sub && git init && >elif &&
	510	git add elif && git commit -m "submodule initial"
	511	) &&
	512	echo 1 >file1 &&
	513	git add file1 sub
	514	test_tick &&
	515	git commit -m "One" &&
	516	echo 2 >file1 &&
	517	test_tick &&
	518	git commit -a -m "Two" &&
	519	(
	520	cd sub && echo 3 >elif &&
	521	git commit -a -m "submodule second"
	522	) &&
	523	test_tick &&
	524	git commit -a -m "Three changes submodule"
	525	'
	526
94c88ede	527	test_expect_success 'submodule rebase -i' '
96747696 JH	528	FAKE_LINES="1 squash 2 3" git rebase -i A
	529	'
	530
0e757e30 JS	531	test_expect_success 'avoid unnecessary reset' '
	532	git checkout master &&
	533	test-chmtime =123456789 file3 &&
	534	git update-index --refresh &&
	535	HEAD=$(git rev-parse HEAD) &&
	536	git rebase -i HEAD~4 &&
	537	test $HEAD = $(git rev-parse HEAD) &&
	538	MTIME=$(test-chmtime -v +0 file3 \| sed 's/[^0-9].*$//') &&
	539	test 123456789 = $MTIME
	540	'
	541
6741aa6c BG	542	test_expect_success 'reword' '
	543	git checkout -b reword-branch master &&
	544	FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" git rebase -i A &&
	545	git show HEAD \| grep "E changed" &&
	546	test $(git rev-parse master) != $(git rev-parse HEAD) &&
	547	test $(git rev-parse master^) = $(git rev-parse HEAD^) &&
	548	FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" git rebase -i A &&
	549	git show HEAD^ \| grep "D changed" &&
	550	FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" git rebase -i A &&
	551	git show HEAD~3 \| grep "B changed" &&
	552	FAKE_LINES="1 reword 2 3 4" FAKE_COMMIT_MESSAGE="C changed" git rebase -i A &&
	553	git show HEAD~2 \| grep "C changed"
	554	'
	555
1b1dce4b	556	test_done