diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2021-08-12 13:42:08 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-08-13 11:36:22 -0700 |
| commit | bed9b4e3128af2c36645ba44fe19bf10af6d68ea (patch) | |
| tree | 0480c09b35e32c9c24844728ae4abce102f22c23 /t/t3401-rebase-and-am-rename.sh | |
| parent | t3403: fix commit authorship (diff) | |
| download | tgif-bed9b4e3128af2c36645ba44fe19bf10af6d68ea.tar.xz | |
rebase --apply: restore some tests
980b482d28 ("rebase tests: mark tests specific to the am-backend with
--am", 2020-02-15) sought to prepare tests testing the "apply" backend
in preparation for 2ac0d6273f ("rebase: change the default backend
from "am" to "merge"", 2020-02-15). However some tests seem to have
been missed leading to us testing the "merge" backend twice. This
patch fixes some cases that I noticed while adding tests to these
files, I have not audited all the other rebase test files. I've
reworded a couple of the test descriptions to make it clear which
backend they are testing.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Reviewed-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')
0 files changed, 0 insertions, 0 deletions