Signed-off-by: Matthieu Moy <Matthieu.Moy@xxxxxxx> --- Eric Sunshine <sunshine@xxxxxxxxxxxxxx> writes: > Simpler (replace above two lines): > > test_set_editor "$(pwd)/abort-editor.sh" && Indeed. And I had debug statements left. Hopefully, this after-coffee-v2 will be clear enough and correct ;-). 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 90eb264..ff1e2dc 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.0.0.rc3.499.gd6dc9ad -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html