A while a go Philippe reported [1] that he was surprised 'git rebase --keep-base' removed commits that had been cherry-picked upstream even though to branch was not being rebased. I think it is also surprising if '--keep-base' changes the base of the branch without '--fork-point' being explicitly given on the command line. This series therefore changes the default behavior of '--keep-base' to imply '--reapply-cherry-picks' and '--no-fork-point' so that the base of the branch is unchanged and no commits are removed. Thanks to Junio for his comments, the changes since V2 are: * Patch 3 new patch to make sure we're reading hex oids from state files * Patch 4 restored the call to read_refs() to avoid the dwim behavior of lookup_commit_reference_by_name() * Patch 6 added a comment to clarify what a null oid branch_base means Thanks to everyone who commented for their reviews, the changes since V1 are: * Patch 1: new patch to tighten a couple of existing tests * Patch 2: reworded commit message in response to Junio's comments * Patch 3: fixed a typo in the commit message spotted by Elijah and tidied code formatting * Patch 4: new patch to rename a variable suggested by Junio * Patch 5: clarified commit message and removed some redundant code spotted by Junio * Patch 6: improved --reapply-cherry-picks documentation to mention --keep-base and vice-versa suggested by Philippe * Patch 7: expanded the commit message and documentation in response to Junio's comments [1] https://lore.kernel.org/git/0EA8C067-5805-40A7-857A-55C2633B8570@xxxxxxxxx/ Phillip Wood (8): t3416: tighten two tests t3416: set $EDITOR in subshell rebase: be stricter when reading state files containing oids rebase: store orig_head as a commit rebase: rename merge_base to branch_base rebase: factor out branch_base calculation rebase --keep-base: imply --reapply-cherry-picks rebase --keep-base: imply --no-fork-point Documentation/git-rebase.txt | 32 ++++--- builtin/rebase.c | 139 ++++++++++++++++++------------- t/t3416-rebase-onto-threedots.sh | 62 ++++++++++---- t/t3431-rebase-fork-point.sh | 2 +- 4 files changed, 148 insertions(+), 87 deletions(-) base-commit: afa70145a25e81faa685dc0b465e52b45d2444bd Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1323%2Fphillipwood%2Fwip%2Frebase--keep-base-tweaks-v3 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1323/phillipwood/wip/rebase--keep-base-tweaks-v3 Pull-Request: https://github.com/gitgitgadget/git/pull/1323 Range-diff vs v2: 1: 12fb0ac6d5d = 1: 12fb0ac6d5d t3416: tighten two tests 2: d6f2f716c77 = 2: d6f2f716c77 t3416: set $EDITOR in subshell -: ----------- > 3: 1fd58520253 rebase: be stricter when reading state files containing oids 3: 9daee95d434 ! 4: dc056b13ed5 rebase: store orig_head as a commit @@ Commit message the merge base and fork point as it no longer has to convert from an oid to a commit. + To avoid changing the behavior of "git rebase <upstream> <branch>" we + keep the existing call to read_ref() and use lookup_commit_reference() + on the oid returned by that rather than calling + lookup_commit_reference_by_name() which applies the ref dwim rules to + its argument. lookup_commit_reference() will dereference tag objects + but we do not expect the branch being rebased to be pointing to a tag + object. + + Helped-by: Junio C Hamano <gitster@xxxxxxxxx> Signed-off-by: Phillip Wood <phillip.wood@xxxxxxxxxxxxx> ## builtin/rebase.c ## @@ builtin/rebase.c: static int read_basic_state(struct rebase_options *opts) } else if (!read_oneliner(&buf, state_dir_path("head", opts), READ_ONELINER_WARN_MISSING)) return -1; -- if (get_oid(buf.buf, &opts->orig_head)) -+ opts->orig_head = lookup_commit_reference_by_name(buf.buf); -+ if (!opts->orig_head) +- if (get_oid_hex(buf.buf, &opts->orig_head)) ++ if (get_oid_hex(buf.buf, &oid) || ++ !(opts->orig_head = lookup_commit_reference(the_repository, &oid))) return error(_("invalid orig-head: '%s'"), buf.buf); if (file_exists(state_dir_path("quiet", opts))) @@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix ret = finish_rebase(&options); goto cleanup; @@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix) + */ + if (argc == 1) { + /* Is it "rebase other branchname" or "rebase other commit"? */ ++ struct object_id branch_oid; + branch_name = argv[0]; + options.switch_to = argv[0]; + /* Is it a local branch? */ strbuf_reset(&buf); strbuf_addf(&buf, "refs/heads/%s", branch_name); - if (!read_ref(buf.buf, &options.orig_head)) { -+ options.orig_head = lookup_commit_reference_by_name(buf.buf); -+ if (options.orig_head) { ++ if (!read_ref(buf.buf, &branch_oid)) { die_if_checked_out(buf.buf, 1); options.head_name = xstrdup(buf.buf); ++ options.orig_head = ++ lookup_commit_reference(the_repository, ++ &branch_oid); /* If not is it a valid ref (branch or commit)? */ } else { - struct commit *commit = + options.orig_head = lookup_commit_reference_by_name(branch_name); - if (!commit) -+ if (!options.orig_head) - die(_("no such branch/commit '%s'"), - branch_name); +- die(_("no such branch/commit '%s'"), +- branch_name); - oidcpy(&options.orig_head, &commit->object.oid); options.head_name = NULL; } ++ if (!options.orig_head) ++ die(_("no such branch/commit '%s'"), branch_name); } else if (argc == 0) { + /* Do not need to switch branches, we are already on it. */ + options.head_name = @@ builtin/rebase.c: int cmd_rebase(int argc, const char **argv, const char *prefix) FREE_AND_NULL(options.head_name); branch_name = "HEAD"; 4: cca933a5f1d = 5: 00f70c90344 rebase: rename merge_base to branch_base 5: fc45b996d34 ! 6: 2efbfc94187 rebase: factor out branch_base calculation @@ builtin/rebase.c: static int can_fast_forward(struct commit *onto, struct commit - merge_bases = get_merge_bases(onto, head); - if (!merge_bases || merge_bases->next) { - oidcpy(branch_base, null_oid()); -+ if (is_null_oid(branch_base)) - goto done; +- goto done; - } ++ if (is_null_oid(branch_base)) ++ goto done; /* fill_branch_base() found multiple merge bases */ - oidcpy(branch_base, &merge_bases->item->object.oid); if (!oideq(branch_base, &onto->object.oid)) 6: faad7eaf0d6 = 7: bc39c76b217 rebase --keep-base: imply --reapply-cherry-picks 7: 6410b101d7f = 8: 4d0226e1dcc rebase --keep-base: imply --no-fork-point -- gitgitgadget
