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/t3407-rebase-abort.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/t3407-rebase-abort.sh')
| -rwxr-xr-x | t/t3407-rebase-abort.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh index 910f218284..3e31826170 100755 --- a/t/t3407-rebase-abort.sh +++ b/t/t3407-rebase-abort.sh @@ -96,14 +96,14 @@ testrebase() { ' } -testrebase "" .git/rebase-apply +testrebase " --am" .git/rebase-apply testrebase " --merge" .git/rebase-merge -test_expect_success 'rebase --quit' ' +test_expect_success 'rebase --am --quit' ' cd "$work_dir" && # Clean up the state from the previous one git reset --hard pre-rebase && - test_must_fail git rebase master && + test_must_fail git rebase --am master && test_path_is_dir .git/rebase-apply && head_before=$(git rev-parse HEAD) && git rebase --quit && |