path: root/t/
diff options
authorJohannes Schindelin <>2018-08-31 23:45:04 (GMT)
committerJunio C Hamano <>2018-09-04 15:59:33 (GMT)
commit10d2f35436fb350c42bdb8396aee424a9bce44b5 (patch)
tree49b7fe2d5b85fe388a0689627e519329c68191c6 /t/
parent2f3eb68f10be8541b6ffdcbb16d996fd3c7a9e82 (diff)
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 <>
Diffstat (limited to 't/')
1 files changed, 1 insertions, 1 deletions
diff --git a/t/ b/t/
index 7d5ea34..13f5688 100755
--- a/t/
+++ b/t/
@@ -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" &&