[PATCH] tests: fix autostash
From: Felipe Contreras <hidden>
Date: 2016-06-15 22:57:36
Subsystem:
the rest · Maintainer:
Linus Torvalds
We should call 'git rebase --abort', like a normal user would do. Signed-off-by: Felipe Contreras <redacted> --- 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