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/t3432-rebase-fast-forward.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/t3432-rebase-fast-forward.sh')
| -rwxr-xr-x | t/t3432-rebase-fast-forward.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh index 40388cc..4b3cecc 100755 --- a/t/t3432-rebase-fast-forward.sh +++ b/t/t3432-rebase-fast-forward.sh @@ -28,8 +28,8 @@ test_rebase_same_head () { shift && cmp_f="$1" && shift && - test_rebase_same_head_ $status_n $what_n $cmp_n "" "$*" && - test_rebase_same_head_ $status_f $what_f $cmp_f " --no-ff" "$*" + test_rebase_same_head_ $status_n $what_n $cmp_n " --am" "$*" && + test_rebase_same_head_ $status_f $what_f $cmp_f " --am --no-ff" "$*" test_rebase_same_head_ $status_n $what_n $cmp_n " --merge" "$*" && test_rebase_same_head_ $status_f $what_f $cmp_f " --merge --no-ff" "$*" } |