diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:43 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-07-24 14:50:43 -0700 |
commit | 3467e25e1e72a6ef7983b228d9788357385471b7 (patch) | |
tree | 752510796fbb944ba95fcaf574eed95a14e836e7 /t/t5407-post-rewrite-hook.sh | |
parent | Merge branch 'en/apply-comment-fix' (diff) | |
parent | t5407: fix test to cover intended arguments (diff) | |
download | tgif-3467e25e1e72a6ef7983b228d9788357385471b7.tar.xz |
Merge branch 'en/t5407-rebase-m-fix'
* en/t5407-rebase-m-fix:
t5407: fix test to cover intended arguments
Diffstat (limited to 't/t5407-post-rewrite-hook.sh')
-rwxr-xr-x | t/t5407-post-rewrite-hook.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5407-post-rewrite-hook.sh b/t/t5407-post-rewrite-hook.sh index 7a48236e87..9b2a274c71 100755 --- 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 && |