diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-02-15 21:36:37 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-02-16 15:40:42 -0800 |
| commit | 980b482d28482c307648c3abbcb16ae60843c7ae (patch) | |
| tree | 3ca65ab6bab75614dd4982d24774794501f630dc /t/t5407-post-rewrite-hook.sh | |
| parent | rebase: drop '-i' from the reflog for interactive-based rebases (diff) | |
| download | tgif-980b482d28482c307648c3abbcb16ae60843c7ae.tar.xz | |
rebase tests: mark tests specific to the am-backend with --am
We have many rebase tests in the testsuite, and often the same test is
repeated multiple times just testing different backends. For those
tests that were specifically trying to test the am backend, add the --am
flag.
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 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t5407-post-rewrite-hook.sh b/t/t5407-post-rewrite-hook.sh index 7344253bfb..a8a73616e4 100755 --- a/t/t5407-post-rewrite-hook.sh +++ b/t/t5407-post-rewrite-hook.sh @@ -53,10 +53,10 @@ test_expect_success 'git commit --amend --no-post-rewrite' ' test ! -f post-rewrite.data ' -test_expect_success 'git rebase' ' +test_expect_success 'git rebase --am' ' git reset --hard D && clear_hook_input && - test_must_fail git rebase --onto A B && + test_must_fail git rebase --am --onto A B && echo C > foo && git add foo && git rebase --continue && @@ -68,10 +68,10 @@ test_expect_success 'git rebase' ' verify_hook_input ' -test_expect_success 'git rebase --skip' ' +test_expect_success 'git rebase --am --skip' ' git reset --hard D && clear_hook_input && - test_must_fail git rebase --onto A B && + test_must_fail git rebase --am --onto A B && test_must_fail git rebase --skip && echo D > foo && git add foo && @@ -84,10 +84,10 @@ test_expect_success 'git rebase --skip' ' verify_hook_input ' -test_expect_success 'git rebase --skip the last one' ' +test_expect_success 'git rebase --am --skip the last one' ' git reset --hard F && clear_hook_input && - test_must_fail git rebase --onto D A && + test_must_fail git rebase --am --onto D A && git rebase --skip && echo rebase >expected.args && cat >expected.data <<-EOF && |