mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
rebase: add coverage of other incompatible options
The git-rebase manual noted several sets of incompatible options, but we were missing tests for a few of these. Further, we were missing code checks for one of these, which could result in command line options being silently ignored. Also, note that adding a check for autosquash means that using --whitespace=fix together with the config setting rebase.autosquash=true will trigger an error. A subsequent commit will improve the error message. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
ffeaca177a
commit
796abac7e1
|
@ -1511,6 +1511,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
|||
if (options.update_refs)
|
||||
imply_merge(&options, "--update-refs");
|
||||
|
||||
if (options.autosquash)
|
||||
imply_merge(&options, "--autosquash");
|
||||
|
||||
if (options.type == REBASE_UNSPECIFIED) {
|
||||
if (!strcmp(options.default_backend, "merge"))
|
||||
imply_merge(&options, "--merge");
|
||||
|
|
|
@ -50,6 +50,11 @@ test_rebase_am_only () {
|
|||
test_must_fail git rebase $opt --strategy-option=ours A
|
||||
"
|
||||
|
||||
test_expect_success "$opt incompatible with --autosquash" "
|
||||
git checkout B^0 &&
|
||||
test_must_fail git rebase $opt --autosquash A
|
||||
"
|
||||
|
||||
test_expect_success "$opt incompatible with --interactive" "
|
||||
git checkout B^0 &&
|
||||
test_must_fail git rebase $opt --interactive A
|
||||
|
@ -60,6 +65,16 @@ test_rebase_am_only () {
|
|||
test_must_fail git rebase $opt --exec 'true' A
|
||||
"
|
||||
|
||||
test_expect_success "$opt incompatible with --keep-empty" "
|
||||
git checkout B^0 &&
|
||||
test_must_fail git rebase $opt --keep-empty A
|
||||
"
|
||||
|
||||
test_expect_success "$opt incompatible with --empty=..." "
|
||||
git checkout B^0 &&
|
||||
test_must_fail git rebase $opt --empty=ask A
|
||||
"
|
||||
|
||||
test_expect_success "$opt incompatible with --no-reapply-cherry-picks" "
|
||||
git checkout B^0 &&
|
||||
test_must_fail git rebase $opt --no-reapply-cherry-picks A
|
||||
|
|
Loading…
Reference in a new issue