summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2014-05-20 09:49:31 +0200
committerJunio C Hamano <gitster@pobox.com>2014-05-20 11:33:49 -0700
commitddb5432d2390e1957e473618009ba3d2fbbf29a7 (patch)
treecb4f2678438e68c03f23abc52faa80796bf2184e /t
parente4244eb3957d478ca05b42d8b56aadb9ab2bc7ae (diff)
downloadgit-ddb5432d2390e1957e473618009ba3d2fbbf29a7.tar.gz
rebase -i: test "Nothing to do" case with autostashrr/rebase-autostash-fix
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t3420-rebase-autostash.sh15
1 files changed, 15 insertions, 0 deletions
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