Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'en/t5407-rebase-m-fix'
author
Junio C Hamano
<gitster@pobox.com>
Tue, 24 Jul 2018 21:50:43 +0000
(14:50 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 24 Jul 2018 21:50:43 +0000
(14:50 -0700)
* en/t5407-rebase-m-fix:
t5407: fix test to cover intended arguments
t/t5407-post-rewrite-hook.sh
patch
|
blob
|
history
raw
(from parent 1:
4922a85
)
diff --git
a/t/t5407-post-rewrite-hook.sh
b/t/t5407-post-rewrite-hook.sh
index 7a48236e87695d947c7c3f166e1d291cd3b7a05b..9b2a274c71f40ace060069212055a29f9a3c4203 100755
(executable)
--- a/
t/t5407-post-rewrite-hook.sh
+++ b/
t/t5407-post-rewrite-hook.sh
@@
-113,7
+113,7
@@
test_expect_success 'git rebase -m' '
test_expect_success 'git rebase -m --skip' '
git reset --hard D &&
clear_hook_input &&
- test_must_fail git rebase --onto A B &&
+ test_must_fail git rebase -
m -
-onto A B &&
test_must_fail git rebase --skip &&
echo D > foo &&
git add foo &&