undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'en/rebase-root-and-fork-point-are-incompatible'

Browse Source 
Incompatible options "--root" and "--fork-point" of "git rebase"
have been marked and documented as being incompatible.

* en/rebase-root-and-fork-point-are-incompatible:
  rebase: display an error if --root and --fork-point are both provided
This commit is contained in:
Junio C Hamano 2020-05-01 13:39:58 -07:00
commit 6d6b412da3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-rebase.txt
View File

@ -449,12 +449,14 @@ When --fork-point is active, 'fork_point' will be used instead of
<branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point'
ends up being empty, the <upstream> will be used as a fallback. ends up being empty, the <upstream> will be used as a fallback.
+ +
If either <upstream> or --root is given on the command line, then the If <upstream> is given on the command line, then the default is
default is `--no-fork-point`, otherwise the default is `--fork-point`. `--no-fork-point`, otherwise the default is `--fork-point`.
+ +
If your branch was based on <upstream> but <upstream> was rewound and If your branch was based on <upstream> but <upstream> was rewound and
your branch contains commits which were dropped, this option can be used your branch contains commits which were dropped, this option can be used
with `--keep-base` in order to drop those commits from your branch. with `--keep-base` in order to drop those commits from your branch.
+
See also INCOMPATIBLE OPTIONS below.
--ignore-whitespace:: --ignore-whitespace::
--whitespace=<option>:: --whitespace=<option>::
@ -636,6 +638,7 @@ In addition, the following pairs of options are incompatible:
* --preserve-merges and --empty= * --preserve-merges and --empty=
* --keep-base and --onto * --keep-base and --onto
* --keep-base and --root * --keep-base and --root
* --fork-point and --root
BEHAVIORAL DIFFERENCES BEHAVIORAL DIFFERENCES
----------------------- -----------------------

3
builtin/rebase.c
View File

@ -1481,6 +1481,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
die(_("cannot combine '--keep-base' with '--root'")); die(_("cannot combine '--keep-base' with '--root'"));
} }
if (options.root && fork_point > 0)
die(_("cannot combine '--root' with '--fork-point'"));
if (action != ACTION_NONE && !in_progress) if (action != ACTION_NONE && !in_progress)
die(_("No rebase in progress?")); die(_("No rebase in progress?"));
setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0); setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0);