[PATCH 1/3] Add test for rebase interactive with preserve merges
From: Jörg Sommer <hidden>
Date: 2016-06-15 22:44:24
Subsystem:
the rest · Maintainer:
Linus Torvalds
The intention of “edit … --continue” is to ensure the state is persistent and not saved in internal variables. Signed-off-by: Jörg Sommer <redacted> --- t/t3404-rebase-interactive.sh | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 9cf873f..014b036 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh@@ -212,6 +212,17 @@ test_expect_success 'preserve merges with -p' ' test $(git show HEAD~2:file1) = B ' +test_expect_failure 'preserve merges with -p (case 2)' ' + old_head=$(git rev-parse HEAD) && + test_tick && + EXPECT_COUNT=4 FAKE_LINES="1 4 3 edit 2" git rebase -i -p branch1 && + git rebase --continue && + test $(git rev-parse HEAD) != $old_head +' + +# clean-up from the above test +git reset -q --hard + test_expect_success '--continue tries to commit' ' test_tick && ! git rebase -i --onto new-branch1 HEAD^ &&
--
1.5.4.4