Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Make test number unique
[gitweb.git]
/
t
/
t3404-rebase-interactive.sh
diff --git
a/t/t3404-rebase-interactive.sh
b/t/t3404-rebase-interactive.sh
index 7d8147bb93df482cf7e11338ac96acdf43cf551e..47c8371c7edfe7945ded380bb6f96a00d26c04eb 100755
(executable)
--- a/
t/t3404-rebase-interactive.sh
+++ b/
t/t3404-rebase-interactive.sh
@@
-317,7
+317,7
@@
test_expect_success '--continue tries to commit' '
'
test_expect_success 'verbose flag is heeded, even after --continue' '
- git reset --hard
HEAD
@{1} &&
+ git reset --hard
master
@{1} &&
test_tick &&
test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
echo resolved > file1 &&