From: Felipe Contreras Date: Sun, 09 Jun 2013 16:40:49 GMT Subject: [PATCH v4 37/45] tests: fix autostash Message-ID: <1370796057-25312-38-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1370796057-25312-1-git-send-email-felipe.contreras@gmail.com> We should call 'git rebase --abort', like a normal user would do. Signed-off-by: Felipe Contreras --- t/t3420-rebase-autostash.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index a5e69f3..ff370a3 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -71,8 +71,7 @@ testrebase() { test_must_fail git rebase$type related-onto-branch && test_path_is_file $dotest/autostash && ! grep dirty file3 && - rm -rf $dotest && - git reset --hard && + git rebase --abort && git checkout feature-branch ' -- 1.8.3.698.g079b096