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/t3415-rebase-autosquash.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/t3415-rebase-autosquash.sh')
| -rwxr-xr-x | t/t3415-rebase-autosquash.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index 13f5688..22d2186 100755 --- a/t/t3415-rebase-autosquash.sh +++ b/t/t3415-rebase-autosquash.sh @@ -277,7 +277,7 @@ test_expect_success 'autosquash with empty custom instructionFormat' ' ( set_cat_todo_editor && test_must_fail git -c rebase.instructionFormat= \ - rebase --autosquash --force -i HEAD^ >actual && + rebase --autosquash --force-rebase -i HEAD^ >actual && git log -1 --format="pick %h %s" >expect && test_cmp expect actual ) |