diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2019-03-25 18:14:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-02 00:54:59 (GMT) |
| commit | f927ae6c86cdc2b1b66b3c94e541f8045300d68f (patch) | |
| tree | 7ecfae5a99bd341a6ef665688fdcac6af7ab0a58 /t/t3430-rebase-merges.sh | |
| parent | dd605e4956903da2e375afe2e58beab2af39b7b8 (diff) | |
| download | git-f927ae6c86cdc2b1b66b3c94e541f8045300d68f.zip git-f927ae6c86cdc2b1b66b3c94e541f8045300d68f.tar.gz git-f927ae6c86cdc2b1b66b3c94e541f8045300d68f.tar.bz2 | |
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>
Diffstat (limited to 't/t3430-rebase-merges.sh')
| -rwxr-xr-x | t/t3430-rebase-merges.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh index 4c69255..42ba5b9 100755 --- a/t/t3430-rebase-merges.sh +++ b/t/t3430-rebase-merges.sh @@ -271,7 +271,7 @@ test_expect_success 'root commits' ' EOF test_config sequence.editor \""$PWD"/replace-editor.sh\" && test_tick && - git rebase -i --force --root -r && + git rebase -i --force-rebase --root -r && test "Parsnip" = "$(git show -s --format=%an HEAD^)" && test $(git rev-parse second-root^0) != $(git rev-parse HEAD^) && test $(git rev-parse second-root:second-root.t) = \ @@ -364,7 +364,7 @@ test_expect_success 'octopus merges' ' test_cmp_rev HEAD $before && test_tick && - git rebase -i --force -r HEAD^^ && + git rebase -i --force-rebase -r HEAD^^ && test "Hank" = "$(git show -s --format=%an HEAD)" && test "$before" != $(git rev-parse HEAD) && test_cmp_graph HEAD^^.. <<-\EOF |