{"thread":{"id":"53332","subject":"[PATCH] rebase: display an error if --root and --fork-point are both provided","startedAt":"2020-04-27T16:21:46Z","lastAt":"2020-04-27T17:59:55Z","messageCount":3,"participants":["Elijah Newren via GitGitGadget","Alban Gruin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"396342","messageId":"pull.771.git.git.1588004500766.gitgitgadget@gmail.com","threadId":"53332","inReplyTo":null,"subject":"[PATCH] rebase: display an error if --root and --fork-point are both provided","fromName":"Elijah Newren via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-04-27T16:21:39Z","receivedAt":"2020-04-27T16:21:46Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren \n\n--root implies we want to rebase all commits since the beginning of\nhistory. --fork-point means we want to use the reflog of the specified\nupstream to find the best common ancestor between and\n and only rebase commits since that common ancestor. These\noptions are clearly contradictory, so throw an error (instead of\nsegfaulting on a NULL pointer) if both are specified.\n\nReported-by: Alexander Berg \nSigned-off-by: Elijah Newren \n---\n rebase: display an error if --root and --fork-point are both provided\n \n --root implies we want to rebase all commits since the beginning of\n history. --fork-point means we want to use the reflog of the specified\n upstream to find the best common ancestor between and and only rebase\n commits since that common ancestor. These options are clearly\n contradictory, so throw an error (instead of segfaulting on a NULL\n pointer) if both are specified.\n \n Reported-by: Alexander Berg alexander.berg@atos.net\n [alexander.berg@atos.net]Signed-off-by: Elijah Newren newren@gmail.com\n [newren@gmail.com]\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-771%2Fnewren%2Frebase-fork-point-root-error-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-771/newren/rebase-fork-point-root-error-v1\nPull-Request: https://github.com/git/git/pull/771\n\n builtin/rebase.c | 3 +++\n 1 file changed, 3 insertions(+)\n\ndiff --git a/builtin/rebase.c b/builtin/rebase.c\nindex bff53d5d167..287ac1aa21b 100644\n--- a/builtin/rebase.c\n+++ b/builtin/rebase.c\n@@ -1652,6 +1652,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n \t\t\tdie(_(\"cannot combine '--keep-base' with '--root'\"));\n \t}\n \n+\tif (options.root && fork_point > 0)\n+\t\tdie(_(\"cannot combine '--root' with '--fork-point'\"));\n+\n \tif (action != ACTION_NONE && !in_progress)\n \t\tdie(_(\"No rebase in progress?\"));\n \tsetenv(GIT_REFLOG_ACTION_ENVIRONMENT, \"rebase\", 0);\n\nbase-commit: af6b65d45ef179ed52087e80cb089f6b2349f4ec\n-- \ngitgitgadget\n"},{"id":"396351","messageId":"7f8b3ab5-9632-637d-27db-7e35330ff31d@gmail.com","threadId":"53332","inReplyTo":"pull.771.git.git.1588004500766.gitgitgadget@gmail.com","subject":"Re: [PATCH] rebase: display an error if --root and --fork-point are both provided","fromName":"Alban Gruin","fromEmail":"alban.gruin@gmail.com","sentAt":"2020-04-27T16:46:33Z","receivedAt":"2020-04-27T16:46:47Z","isPatch":true,"sender":{"key":"alban.gruin@gmail.com","avatar":"https://avatars.githubusercontent.com/u/6310153?v=4"},"body":"Hi Elijah,\n\nLe 27/04/2020 à 18:21, Elijah Newren via GitGitGadget a écrit :\n> From: Elijah Newren \n> \n> --root implies we want to rebase all commits since the beginning of\n> history. --fork-point means we want to use the reflog of the specified\n> upstream to find the best common ancestor between and\n> and only rebase commits since that common ancestor. These\n> options are clearly contradictory, so throw an error (instead of\n> segfaulting on a NULL pointer) if both are specified.\n> \n> Reported-by: Alexander Berg \n> Signed-off-by: Elijah Newren \n> ---\n> rebase: display an error if --root and --fork-point are both provided\n> \n> --root implies we want to rebase all commits since the beginning of\n> history. --fork-point means we want to use the reflog of the specified\n> upstream to find the best common ancestor between and and only rebase\n> commits since that common ancestor. These options are clearly\n> contradictory, so throw an error (instead of segfaulting on a NULL\n> pointer) if both are specified.\n> \n> Reported-by: Alexander Berg alexander.berg@atos.net\n> [alexander.berg@atos.net]Signed-off-by: Elijah Newren newren@gmail.com\n> [newren@gmail.com]\n> \n> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-771%2Fnewren%2Frebase-fork-point-root-error-v1\n> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-771/newren/rebase-fork-point-root-error-v1\n> Pull-Request: https://github.com/git/git/pull/771\n> \n> builtin/rebase.c | 3 +++\n> 1 file changed, 3 insertions(+)\n> \n> diff --git a/builtin/rebase.c b/builtin/rebase.c\n> index bff53d5d167..287ac1aa21b 100644\n> --- a/builtin/rebase.c\n> +++ b/builtin/rebase.c\n> @@ -1652,6 +1652,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)\n> \t\t\tdie(_(\"cannot combine '--keep-base' with '--root'\"));\n> \t}\n> \n> +\tif (options.root && fork_point > 0)\n> +\t\tdie(_(\"cannot combine '--root' with '--fork-point'\"));\n> +\n> \tif (action != ACTION_NONE && !in_progress)\n> \t\tdie(_(\"No rebase in progress?\"));\n> \tsetenv(GIT_REFLOG_ACTION_ENVIRONMENT, \"rebase\", 0);\n> \n> base-commit: af6b65d45ef179ed52087e80cb089f6b2349f4ec\n> \n\nThe patch is fairly obvious and looks good to me.\n\nThe documentation must be updated, too, since it does not mention the\nincompatibility between the two switches:\n\n-- snip --\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex bed500f151..a30de5aa20 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -448,12 +448,14 @@ When --fork-point is active, 'fork_point' will be\nused instead of\n ` command (see linkgit:git-merge-base[1]). If 'fork_point'\n ends up being empty, the will be used as a fallback.\n +\n-If either or --root is given on the command line, then the\n-default is `--no-fork-point`, otherwise the default is `--fork-point`.\n+If is given on the command line, then the default is\n+`--no-fork-point`, otherwise the default is `--fork-point`.\n +\n If your branch was based on but was rewound and\n your branch contains commits which were dropped, this option can be used\n with `--keep-base` in order to drop those commits from your branch.\n++\n+See also INCOMPATIBLE OPTIONS below.\n\n --ignore-whitespace::\n --whitespace=