diff options
| author | Elijah Newren <newren@gmail.com> | 2020-02-15 21:36:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-16 23:40:42 (GMT) |
| commit | 980b482d28482c307648c3abbcb16ae60843c7ae (patch) | |
| tree | 3ca65ab6bab75614dd4982d24774794501f630dc /t/t3401-rebase-and-am-rename.sh | |
| parent | c2417d3af7574adc1fb14f7df31b862aa9551e2e (diff) | |
| download | git-980b482d28482c307648c3abbcb16ae60843c7ae.zip git-980b482d28482c307648c3abbcb16ae60843c7ae.tar.gz git-980b482d28482c307648c3abbcb16ae60843c7ae.tar.bz2 | |
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/t3401-rebase-and-am-rename.sh')
| -rwxr-xr-x | t/t3401-rebase-and-am-rename.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3401-rebase-and-am-rename.sh b/t/t3401-rebase-and-am-rename.sh index a0b9438..5080395 100755 --- a/t/t3401-rebase-and-am-rename.sh +++ b/t/t3401-rebase-and-am-rename.sh @@ -52,13 +52,13 @@ test_expect_success 'rebase --interactive: directory rename detected' ' ) ' -test_expect_failure 'rebase (am): directory rename detected' ' +test_expect_failure 'rebase --am: directory rename detected' ' ( cd dir-rename && git checkout B^0 && - git -c merge.directoryRenames=true rebase A && + git -c merge.directoryRenames=true rebase --am A && git ls-files -s >out && test_line_count = 5 out && |