diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2015-06-18 18:38:53 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-29 13:12:43 -0700 |
| commit | 0e0aff4b4ca93053a83578cb040475c6e3185f2d (patch) | |
| tree | bbbd4458915698daf4fd50b4a17b322d734b52b4 /t/t3404-rebase-interactive.sh | |
| parent | d17ec3a9daffd7f525f39b52011dc653afcbd275 (diff) | |
| download | git-0e0aff4b4ca93053a83578cb040475c6e3185f2d.tar.gz | |
rebase -i: do not leave a CHERRY_PICK_HEAD file behindjs/rebase-i-clean-up-upon-continue-to-skip
When skipping commits whose changes were already applied via `git rebase
--continue`, we need to clean up said file explicitly.
The same is not true for `git rebase --skip` because that will execute
`git reset --hard` as part of the "skip" handling in git-rebase.sh, even
before git-rebase--interactive.sh is called.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3404-rebase-interactive.sh')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 0fb87dc716..914020176d 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -1039,7 +1039,7 @@ test_expect_success 'short SHA-1 collide' ' ) ' -test_expect_failure 'rebase --continue removes CHERRY_PICK_HEAD' ' +test_expect_success 'rebase --continue removes CHERRY_PICK_HEAD' ' git checkout -b commit-to-skip && for double in X 3 1 do |