From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Aug 2015 17:41:34 +0000 (-0700)
Subject: Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maint
X-Git-Tag: v2.4.8~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/29dce32f79765cb3c2ed4c3b8ef439e5e399af8e

Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maint

Abandoning an already applied change in "git rebase -i" with
"--continue" left CHERRY_PICK_HEAD and confused later steps.

* js/rebase-i-clean-up-upon-continue-to-skip:
rebase -i: do not leave a CHERRY_PICK_HEAD file behind
t3404: demonstrate CHERRY_PICK_HEAD bug
---

29dce32f79765cb3c2ed4c3b8ef439e5e399af8e
diff --cc t/t3404-rebase-interactive.sh
index ac429a0bbb,914020176d..467e6c1ed5
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@@ -1039,67 -1039,25 +1039,88 @@@ test_expect_success 'short SHA-1 collid
  	)
  '
  
 +test_expect_success 'respect core.abbrev' '
 +	git config core.abbrev 12 &&
 +	set_cat_todo_editor &&
 +	test_must_fail git rebase -i HEAD~4 >todo-list &&
 +	test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list)
 +'
 +
 +test_expect_success 'todo count' '
 +	write_script dump-raw.sh <<-\EOF &&
 +		cat "$1"
 +	EOF
 +	test_set_editor "$(pwd)/dump-raw.sh" &&
 +	git rebase -i HEAD~4 >actual &&
 +	grep "^# Rebase ..* onto ..* ([0-9]" actual
 +'
 +
 +test_expect_success 'rebase -i commits that overwrite untracked files (pick)' '
 +	git checkout --force branch2 &&
 +	git clean -f &&
 +	set_fake_editor &&
 +	FAKE_LINES="edit 1 2" git rebase -i A &&
 +	test_cmp_rev HEAD F &&
 +	test_path_is_missing file6 &&
 +	>file6 &&
 +	test_must_fail git rebase --continue &&
 +	test_cmp_rev HEAD F &&
 +	rm file6 &&
 +	git rebase --continue &&
 +	test_cmp_rev HEAD I
 +'
 +
 +test_expect_success 'rebase -i commits that overwrite untracked files (squash)' '
 +	git checkout --force branch2 &&
 +	git clean -f &&
 +	git tag original-branch2 &&
 +	set_fake_editor &&
 +	FAKE_LINES="edit 1 squash 2" git rebase -i A &&
 +	test_cmp_rev HEAD F &&
 +	test_path_is_missing file6 &&
 +	>file6 &&
 +	test_must_fail git rebase --continue &&
 +	test_cmp_rev HEAD F &&
 +	rm file6 &&
 +	git rebase --continue &&
 +	test $(git cat-file commit HEAD | sed -ne \$p) = I &&
 +	git reset --hard original-branch2
 +'
 +
 +test_expect_success 'rebase -i commits that overwrite untracked files (no ff)' '
 +	git checkout --force branch2 &&
 +	git clean -f &&
 +	set_fake_editor &&
 +	FAKE_LINES="edit 1 2" git rebase -i --no-ff A &&
 +	test $(git cat-file commit HEAD | sed -ne \$p) = F &&
 +	test_path_is_missing file6 &&
 +	>file6 &&
 +	test_must_fail git rebase --continue &&
 +	test $(git cat-file commit HEAD | sed -ne \$p) = F &&
 +	rm file6 &&
 +	git rebase --continue &&
 +	test $(git cat-file commit HEAD | sed -ne \$p) = I
 +'
 +
+ test_expect_success 'rebase --continue removes CHERRY_PICK_HEAD' '
+ 	git checkout -b commit-to-skip &&
+ 	for double in X 3 1
+ 	do
+ 		test_seq 5 | sed "s/$double/&&/" >seq &&
+ 		git add seq &&
+ 		test_tick &&
+ 		git commit -m seq-$double
+ 	done &&
+ 	git tag seq-onto &&
+ 	git reset --hard HEAD~2 &&
+ 	git cherry-pick seq-onto &&
+ 	set_fake_editor &&
+ 	test_must_fail env FAKE_LINES= git rebase -i seq-onto &&
+ 	test -d .git/rebase-merge &&
+ 	git rebase --continue &&
+ 	git diff --exit-code seq-onto &&
+ 	test ! -d .git/rebase-merge &&
+ 	test ! -f .git/CHERRY_PICK_HEAD
+ '
+ 
  test_done