From ddb5432d2390e1957e473618009ba3d2fbbf29a7 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Tue, 20 May 2014 09:49:31 +0200 Subject: [PATCH] rebase -i: test "Nothing to do" case with autostash Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- t/t3420-rebase-autostash.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 90eb26493c..d783f03d3f 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -167,4 +167,19 @@ testrebase "" .git/rebase-apply testrebase " --merge" .git/rebase-merge testrebase " --interactive" .git/rebase-merge +test_expect_success 'abort rebase -i with --autostash' ' + test_when_finished "git reset --hard" && + echo uncommited-content >file0 && + ( + write_script abort-editor.sh <<-\EOF && + echo >"$1" + EOF + test_set_editor "$(pwd)/abort-editor.sh" && + test_must_fail git rebase -i --autostash HEAD^ && + rm -f abort-editor.sh + ) && + echo uncommited-content >expected && + test_cmp expected file0 +' + test_done -- 2.11.4.GIT