diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-16 10:06:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-16 10:06:57 -0700 |
| commit | 4a43d4f98a1a6a472ce1e87c64cb6df0d1653d02 (patch) | |
| tree | 298f55985603d82fbf0b56512e3a434dc08242a6 /t | |
| parent | 9d1d882e9c1d4a34e2ae3af47d50c1f115a6cf84 (diff) | |
| parent | ddb5432d2390e1957e473618009ba3d2fbbf29a7 (diff) | |
| download | git-4a43d4f98a1a6a472ce1e87c64cb6df0d1653d02.tar.gz | |
Merge branch 'rr/rebase-autostash-fix'
* rr/rebase-autostash-fix:
rebase -i: test "Nothing to do" case with autostash
rebase -i: handle "Nothing to do" case with autostash
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3420-rebase-autostash.sh | 15 |
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 |