diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-08-31 16:45:04 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-09-04 08:59:33 -0700 |
| commit | 10d2f35436fb350c42bdb8396aee424a9bce44b5 (patch) | |
| tree | 49b7fe2d5b85fe388a0689627e519329c68191c6 /t | |
| parent | rebase -i --autosquash: demonstrate a problem skipping the last squash (diff) | |
| download | tgif-10d2f35436fb350c42bdb8396aee424a9bce44b5.tar.xz | |
rebase -i: be careful to wrap up fixup/squash chains
When an interactive rebase was stopped at the end of a fixup/squash
chain, the user might have edited the commit manually before continuing
(with either `git rebase --skip` or `git rebase --continue`, it does not
really matter which).
We need to be very careful to wrap up the fixup/squash chain also in
this scenario: otherwise the next fixup/squash chain would try to pick
up where the previous one was left.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3415-rebase-autosquash.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index 7d5ea340b3..13f5688135 100755 --- a/t/t3415-rebase-autosquash.sh +++ b/t/t3415-rebase-autosquash.sh @@ -330,7 +330,7 @@ test_expect_success 'wrapped original subject' ' test $base = $parent ' -test_expect_failure 'abort last squash' ' +test_expect_success 'abort last squash' ' test_when_finished "test_might_fail git rebase --abort" && test_when_finished "git checkout master" && |