From: Matthieu Moy Date: Tue, 20 May 2014 06:55:13 GMT Subject: [PATCH] rebase -i: test "Nothing to do" case with autostash Message-ID: <1400568913-1340-1-git-send-email-Matthieu.Moy@imag.fr> In-Reply-To: <1400537120-9995-1-git-send-email-artagnon@gmail.com> Signed-off-by: Matthieu Moy --- Ram's patch lacks a test. Here it is. Fails without Ram's patch, and passes with it. Can be squashed into Ram's patch. t/t3420-rebase-autostash.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 90eb264..c2e9a4c 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -167,4 +167,21 @@ testrebase "" .git/rebase-apply testrebase " --merge" .git/rebase-merge testrebase " --interactive" .git/rebase-merge +test_expect_success 'Abort rebase with --autostash' ' + git log && + echo new-content >file0 && + ( + write_script abort-editor.sh <<-\EOF && + echo > "$1" + EOF + GIT_EDITOR=\"$(pwd)/abort-editor.sh\" && + export GIT_EDITOR && + test_must_fail git rebase -i --autostash HEAD^ && + rm -f abort-editor.sh + ) && + git status && + echo new-content >expected && + test_cmp expected file0 +' + test_done -- 2.0.0.rc3.499.gd6dc9ad