diff options
| author | Elijah Newren <newren@gmail.com> | 2018-06-07 07:05:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-28 22:28:19 +0200 |
| commit | e951e8f6a9fa1940d1e89bad07480f9224ebbdf3 (patch) | |
| tree | 6841ed3e2bfd281a1e872679e0173c33b4a2711e /t/t5407-post-rewrite-hook.sh | |
| parent | Second batch for 2.19 cycle (diff) | |
| download | git-e951e8f6a9fa1940d1e89bad07480f9224ebbdf3.tar.xz git-e951e8f6a9fa1940d1e89bad07480f9224ebbdf3.zip | |
t5407: fix test to cover intended arguments
Test 8 in t5407 appears to be an accidental exact duplicate of of test 5;
the testcode is identical and has identical repo state, but the test
description is different and suggests that rebase -m followed by rebase
--skip was what was actually supposed to be tested. Modify the test to
include the -m option.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 && |