Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'js/maint-1.6.6-send-pack-stateless-rpc-deadlock-fix' into js/maint-send-pack-stateless-rpc-deadlock-fix
[gitweb.git]
/
t
/
t3407-rebase-abort.sh
diff --git
a/t/t3407-rebase-abort.sh
b/t/t3407-rebase-abort.sh
index 4de550a632e6ead08c9629e80901e4735c53f55c..2999e78937f31a45e9e2ea925f69ac00f157503f 100755
(executable)
--- 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"
'