t3418: test `rebase -r` with merge strategies
There is a test case in this script that verifies that `git rebase --preserve-merges` works all right with non-default merge strategies or non-default merge strategy options. Now that `git rebase --rebase-merges` learned about merge strategies, let's copy-edit this test case to verify that that works as intended, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jul 31, 2019 at 08:18 UTC
a63f990d9205d1a781aec310e44edf35e29063a2
1 file changed
+14
t/t3418-rebase-continue.sh
+14
@@ -120,6 +120,20 @@ test_expect_success REBASE_P 'rebase passes merge strategy options correctly' '
120
git rebase --continue
121
'
122
123
+test_expect_success 'rebase -r passes merge strategy options correctly' '
124
+ rm -fr .git/rebase-* &&
125
+ git reset --hard commit-new-file-F3-on-topic-branch &&
126
+ test_commit merge-theirs &&
127
+ git reset --hard HEAD^ &&
128
+ test_commit some-other-commit &&
129
+ test_tick &&
130
+ git merge --no-ff merge-theirs &&
131
+ FAKE_LINES="1 3 edit 4 5 7 8 9" git rebase -i -f -r -m \
132
+ -s recursive --strategy-option=theirs HEAD~2 &&
133
+ test_commit force-change-ours &&
134
+ git rebase --continue
135
+'
136
+
137
test_expect_success '--skip after failed fixup cleans commit message' '
138
test_when_finished "test_might_fail git rebase --abort" &&
139
git checkout -b with-conflicting-fixup &&