X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft3407-rebase-abort.sh;h=2999e78937f31a45e9e2ea925f69ac00f157503f;hb=48c250a121a425a1860226b6a7061aecfbab5246;hp=1777ffe8a22d8f9dd28efadd3cb9ea65be9c2178;hpb=438d2991eaa17549df67929cd4558d65840c37d7;p=git.git diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh index 1777ffe8a..2999e7893 100755 --- a/t/t3407-rebase-abort.sh +++ b/t/t3407-rebase-abort.sh @@ -52,7 +52,7 @@ testrebase() { test -d "$dotest" && test_must_fail git rebase --skip && test $(git rev-parse HEAD) = $(git rev-parse master) && - git-rebase --abort && + git rebase --abort && test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) && test ! -d "$dotest" ' @@ -74,7 +74,7 @@ testrebase() { ' } -testrebase "" .dotest -testrebase " --merge" .git/.dotest-merge +testrebase "" .git/rebase-apply +testrebase " --merge" .git/rebase-merge test_done