diff options
| author | Elijah Newren <newren@gmail.com> | 2020-02-15 22:36:37 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-17 00:40:42 +0100 |
| commit | 980b482d28482c307648c3abbcb16ae60843c7ae (patch) | |
| tree | 3ca65ab6bab75614dd4982d24774794501f630dc /t/t3400-rebase.sh | |
| parent | rebase: drop '-i' from the reflog for interactive-based rebases (diff) | |
| download | git-980b482d28482c307648c3abbcb16ae60843c7ae.tar.xz git-980b482d28482c307648c3abbcb16ae60843c7ae.zip | |
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/t3400-rebase.sh')
| -rwxr-xr-x | t/t3400-rebase.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 71fd6396cd..0a491f2363 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -183,19 +183,19 @@ test_expect_success 'default to common base in @{upstream}s reflog if no upstrea test_cmp expect actual ' -test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' ' +test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg (--am)' ' git checkout -B default-base master && git checkout -B default topic && git config branch.default.remote . && git config branch.default.merge refs/heads/default-base && - git rebase && + git rebase --am && git rev-parse --verify default-base >expect && git rev-parse default~1 >actual && test_cmp expect actual && git checkout default-base && git reset --hard HEAD^ && git checkout default && - git rebase && + git rebase --am && git rev-parse --verify default-base >expect && git rev-parse default~1 >actual && test_cmp expect actual @@ -226,7 +226,7 @@ test_expect_success 'cherry-picked commits and fork-point work together' ' test_expect_success 'rebase --am -q is quiet' ' git checkout -b quiet topic && - git rebase -q master >output.out 2>&1 && + git rebase --am -q master >output.out 2>&1 && test_must_be_empty output.out ' @@ -325,7 +325,7 @@ test_expect_success 'rebase --am and --show-current-patch' ' echo two >>init.t && git commit -a -m two && git tag two && - test_must_fail git rebase -f --onto init HEAD^ && + test_must_fail git rebase --am -f --onto init HEAD^ && GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr && grep "show.*$(git rev-parse two)" stderr ) |