tests (rebase): spell out the `--force-rebase` option
In quite a few test cases, we were sloppy and used the abbreviation `--force`, but we really should be precise in what we want to test. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Mar 25, 2019 at 11:14 UTC
f927ae6c86cdc2b1b66b3c94e541f8045300d68f
2 files changed
+3
-3
t/t3415-rebase-autosquash.sh
+1
-1
@@ -277,7 +277,7 @@ test_expect_success 'autosquash with empty custom instructionFormat' '
277
(
278
set_cat_todo_editor &&
279
test_must_fail git -c rebase.instructionFormat= \
280
- rebase --autosquash --force -i HEAD^ >actual &&
280
+ rebase --autosquash --force-rebase -i HEAD^ >actual &&
281
git log -1 --format="pick %h %s" >expect &&
282
test_cmp expect actual
283
)
t/t3430-rebase-merges.sh
+2
-2
@@ -271,7 +271,7 @@ test_expect_success 'root commits' '
271
EOF
272
test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
273
test_tick &&
274
- git rebase -i --force --root -r &&
274
+ git rebase -i --force-rebase --root -r &&
275
test "Parsnip" = "$(git show -s --format=%an HEAD^)" &&
276
test $(git rev-parse second-root^0) != $(git rev-parse HEAD^) &&
277
test $(git rev-parse second-root:second-root.t) = \
@@ -364,7 +364,7 @@ test_expect_success 'octopus merges' '
364
test_cmp_rev HEAD $before &&
365
366
test_tick &&
367
- git rebase -i --force -r HEAD^^ &&
367
+ git rebase -i --force-rebase -r HEAD^^ &&
368
test "Hank" = "$(git show -s --format=%an HEAD)" &&
369
test "$before" != $(git rev-parse HEAD) &&
370
test_cmp_graph HEAD^^.. <<-\EOF