diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-08-03 10:41:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-03 10:41:34 -0700 |
| commit | 29dce32f79765cb3c2ed4c3b8ef439e5e399af8e (patch) | |
| tree | 1e3b6d8b67cd926af37bd4239f5e690ffa1e6f94 /t | |
| parent | Merge branch 'ss/clone-guess-dir-name-simplify' into maint (diff) | |
| parent | rebase -i: do not leave a CHERRY_PICK_HEAD file behind (diff) | |
| download | tgif-29dce32f79765cb3c2ed4c3b8ef439e5e399af8e.tar.xz | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index ac429a0bbb..467e6c1ed5 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1102,4 +1102,25 @@ test_expect_success 'rebase -i commits that overwrite untracked files (no ff)' ' 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 |