X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft3407-rebase-abort.sh;h=2999e78937f31a45e9e2ea925f69ac00f157503f;hb=48c250a121a425a1860226b6a7061aecfbab5246;hp=12c8804a030f889bc0a416d5743600aa8a427eb7;hpb=223bb84572c8b2058e175e8452913bcb1bdb0ade;p=git.git diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh index 12c8804a0..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 "" .git/rebase +testrebase "" .git/rebase-apply testrebase " --merge" .git/rebase-merge test_done