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>
Phillip Wood committed
Aug 12, 2021 at 13:42 UTC
bed9b4e3128af2c36645ba44fe19bf10af6d68ea
2 files changed
+5
-5
t/t3403-rebase-skip.sh
+1
-1
@@ -52,7 +52,7 @@ test_expect_success setup '
52
'
53
54
test_expect_success 'rebase with git am -3 (default)' '
55
- test_must_fail git rebase main
55
+ test_must_fail git rebase --apply main
56
'
57
58
test_expect_success 'rebase --skip can not be used with other options' '
t/t3418-rebase-continue.sh
+4
-4
@@ -21,7 +21,7 @@ test_expect_success 'setup' '
21
git checkout main
22
'
23
24
-test_expect_success 'interactive rebase --continue works with touched file' '
24
+test_expect_success 'merge based rebase --continue with works with touched file' '
25
rm -fr .git/rebase-* &&
26
git reset --hard &&
27
git checkout main &&
@@ -31,12 +31,12 @@ test_expect_success 'interactive rebase --continue works with touched file' '
31
git rebase --continue
32
'
33
34
-test_expect_success 'non-interactive rebase --continue works with touched file' '
34
+test_expect_success 'apply based rebase --continue works with touched file' '
35
rm -fr .git/rebase-* &&
36
git reset --hard &&
37
git checkout main &&
38
39
- test_must_fail git rebase --onto main main topic &&
39
+ test_must_fail git rebase --apply --onto main main topic &&
40
echo "Resolved" >F2 &&
41
git add F2 &&
42
test-tool chmtime =-60 F1 &&
@@ -254,7 +254,7 @@ test_rerere_autoupdate () {
254
'
255
}
256
257
-test_rerere_autoupdate
257
+test_rerere_autoupdate --apply
258
test_rerere_autoupdate -m
259
GIT_SEQUENCE_EDITOR=: && export GIT_SEQUENCE_EDITOR
260
test_rerere_autoupdate -i