diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-09-03 14:51:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-03 14:51:56 -0700 |
| commit | 36f44a06802960abce7febbf9cc40461e5546ee5 (patch) | |
| tree | d0001f04f2edfb3644c304626908f31d495cb17b /t/t3407-rebase-abort.sh | |
| parent | Fix passwd(5) ref and reflect that commit doens't use commit-tree (diff) | |
| parent | tests: use "git xyzzy" form (t7200 - t9001) (diff) | |
| download | tgif-36f44a06802960abce7febbf9cc40461e5546ee5.tar.xz | |
Merge branch 'ho/dashless' into maint
* ho/dashless:
tests: use "git xyzzy" form (t7200 - t9001)
tests: use "git xyzzy" form (t7000 - t7199)
tests: use "git xyzzy" form (t3600 - t6999)
tests: use "git xyzzy" form (t0000 - t3599)
'git foo' program identifies itself without dash in die() messages
Start conforming code to "git subcmd" style
Diffstat (limited to 't/t3407-rebase-abort.sh')
| -rwxr-xr-x | t/t3407-rebase-abort.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh index 4de550a632..2999e78937 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" ' |