| Message ID | cced4a48360b4e4a8ce791e9404ac6b37bae4eba.1660576283.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | rebase --keep-base: imply --reapply-cherry-picks and --no-fork-point | expand |
"Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Phillip Wood <phillip.wood@dunelm.org.uk> > > Using a struct commit rather than a struct oid to hold orig_head means > that we error out straight away if branch being rebased does not point > to a commit. It also simplifies the code than handles finding the > merge base and fork point as it not longer has to convert from an oid > to a commit. As lookup_commit_reference_by_name() eventually calls into deref_tag(), a command like git rebase -i maint $(git rev-parse v2.37.2) would presumably still work, which is good.
Hi Phillip, On Mon, 15 Aug 2022, Phillip Wood via GitGitGadget wrote: > From: Phillip Wood <phillip.wood@dunelm.org.uk> > > Using a struct commit rather than a struct oid to hold orig_head means > that we error out straight away if branch being rebased does not point > to a commit. It also simplifies the code than handles finding the > merge base and fork point as it not longer has to convert from an oid > to a commit. Very nice! The diff is necessarily "chatty", therefore it is especially good that you separated out this concern into its own, easily-reviewable commit. Thank you, Dscho
On Mon, Aug 15, 2022 at 8:14 AM Phillip Wood via GitGitGadget <gitgitgadget@gmail.com> wrote: > > From: Phillip Wood <phillip.wood@dunelm.org.uk> > > Using a struct commit rather than a struct oid to hold orig_head means > that we error out straight away if branch being rebased does not point > to a commit. It also simplifies the code than handles finding the s/than/that/ ? > merge base and fork point as it not longer has to convert from an oid > to a commit. > > Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> > --- > builtin/rebase.c | 62 ++++++++++++++++++++++-------------------------- > 1 file changed, 28 insertions(+), 34 deletions(-) > > diff --git a/builtin/rebase.c b/builtin/rebase.c > index 56e4214b441..6cf9c95f4e1 100644 > --- a/builtin/rebase.c > +++ b/builtin/rebase.c > @@ -68,7 +68,7 @@ struct rebase_options { > const char *upstream_name; > const char *upstream_arg; > char *head_name; > - struct object_id orig_head; > + struct commit *orig_head; > struct commit *onto; > const char *onto_name; > const char *revisions; > @@ -261,13 +261,13 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) > struct replay_opts replay = get_replay_opts(opts); > struct string_list commands = STRING_LIST_INIT_DUP; > > - if (get_revision_ranges(opts->upstream, opts->onto, &opts->orig_head, > + if (get_revision_ranges(opts->upstream, opts->onto, &opts->orig_head->object.oid, > &revisions, &shortrevisions)) > return -1; > > if (init_basic_state(&replay, > opts->head_name ? opts->head_name : "detached HEAD", > - opts->onto, &opts->orig_head)) { > + opts->onto, &opts->orig_head->object.oid)) { > free(revisions); > free(shortrevisions); > > @@ -298,9 +298,8 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) > split_exec_commands(opts->cmd, &commands); > ret = complete_action(the_repository, &replay, flags, > shortrevisions, opts->onto_name, opts->onto, > - &opts->orig_head, &commands, opts->autosquash, > - opts->update_refs, > - &todo_list); > + &opts->orig_head->object.oid, &commands, > + opts->autosquash, opts->update_refs, &todo_list); > } > > string_list_clear(&commands, 0); > @@ -448,7 +447,8 @@ 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) > return error(_("invalid orig-head: '%s'"), buf.buf); > > if (file_exists(state_dir_path("quiet", opts))) > @@ -517,7 +517,7 @@ static int rebase_write_basic_state(struct rebase_options *opts) > write_file(state_dir_path("onto", opts), "%s", > opts->onto ? oid_to_hex(&opts->onto->object.oid) : ""); > write_file(state_dir_path("orig-head", opts), "%s", > - oid_to_hex(&opts->orig_head)); > + oid_to_hex(&opts->orig_head->object.oid)); > if (!(opts->flags & REBASE_NO_QUIET)) > write_file(state_dir_path("quiet", opts), "%s", ""); > if (opts->flags & REBASE_VERBOSE) > @@ -646,7 +646,7 @@ static int run_am(struct rebase_options *opts) > /* this is now equivalent to !opts->upstream */ > &opts->onto->object.oid : > &opts->upstream->object.oid), > - oid_to_hex(&opts->orig_head)); > + oid_to_hex(&opts->orig_head->object.oid)); > > rebased_patches = xstrdup(git_path("rebased-patches")); > format_patch.out = open(rebased_patches, > @@ -680,7 +680,7 @@ static int run_am(struct rebase_options *opts) > free(rebased_patches); > strvec_clear(&am.args); > > - ropts.oid = &opts->orig_head; > + ropts.oid = &opts->orig_head->object.oid; > ropts.branch = opts->head_name; > ropts.default_reflog_action = DEFAULT_REFLOG_ACTION; > reset_head(the_repository, &ropts); > @@ -833,7 +833,7 @@ static int checkout_up_to_date(struct rebase_options *options) > strbuf_addf(&buf, "%s: checkout %s", > getenv(GIT_REFLOG_ACTION_ENVIRONMENT), > options->switch_to); > - ropts.oid = &options->orig_head; > + ropts.oid = &options->orig_head->object.oid; > ropts.branch = options->head_name; > ropts.flags = RESET_HEAD_RUN_POST_CHECKOUT_HOOK; > if (!ropts.branch) > @@ -866,15 +866,11 @@ static int is_linear_history(struct commit *from, struct commit *to) > > static int can_fast_forward(struct commit *onto, struct commit *upstream, > struct commit *restrict_revision, > - struct object_id *head_oid, struct object_id *merge_base) > + struct commit *head, struct object_id *merge_base) > { > - struct commit *head = lookup_commit(the_repository, head_oid); > struct commit_list *merge_bases = NULL; > int res = 0; > > - if (!head) > - goto done; > - > merge_bases = get_merge_bases(onto, head); > if (!merge_bases || merge_bases->next) { > oidcpy(merge_base, null_oid()); > @@ -1312,13 +1308,13 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > > if (read_basic_state(&options)) > exit(1); > - ropts.oid = &options.orig_head; > + ropts.oid = &options.orig_head->object.oid; > ropts.branch = options.head_name; > ropts.flags = RESET_HEAD_HARD; > ropts.default_reflog_action = DEFAULT_REFLOG_ACTION; > if (reset_head(the_repository, &ropts) < 0) > die(_("could not move back to %s"), > - oid_to_hex(&options.orig_head)); > + oid_to_hex(&options.orig_head->object.oid)); > remove_branch_state(the_repository, 0); > ret = finish_rebase(&options); > goto cleanup; > @@ -1610,17 +1606,17 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > /* 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) { > die_if_checked_out(buf.buf, 1); > options.head_name = xstrdup(buf.buf); > /* 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); > - oidcpy(&options.orig_head, &commit->object.oid); > options.head_name = NULL; > } > } else if (argc == 0) { > @@ -1639,8 +1635,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > FREE_AND_NULL(options.head_name); > branch_name = "HEAD"; > } > - if (get_oid("HEAD", &options.orig_head)) > - die(_("Could not resolve HEAD to a revision")); > + options.orig_head = lookup_commit_reference_by_name("HEAD"); > + if (!options.orig_head) > + die(_("Could not resolve HEAD to a commit")); > } else > BUG("unexpected number of arguments left to parse"); > > @@ -1672,13 +1669,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > options.onto_name); > } > > - if (options.fork_point > 0) { > - struct commit *head = > - lookup_commit_reference(the_repository, > - &options.orig_head); > + if (options.fork_point > 0) > options.restrict_revision = > - get_fork_point(options.upstream_name, head); > - } > + get_fork_point(options.upstream_name, options.orig_head); > + > > if (repo_read_index(the_repository) < 0) > die(_("could not read index")); > @@ -1708,7 +1702,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > * call it before checking allow_preemptive_ff. > */ > if (can_fast_forward(options.onto, options.upstream, options.restrict_revision, > - &options.orig_head, &merge_base) && > + options.orig_head, &merge_base) && > allow_preemptive_ff) { > int flag; > > @@ -1785,7 +1779,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > strbuf_addf(&msg, "%s: checkout %s", > getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name); > ropts.oid = &options.onto->object.oid; > - ropts.orig_head = &options.orig_head, > + ropts.orig_head = &options.orig_head->object.oid, > ropts.flags = RESET_HEAD_DETACH | RESET_ORIG_HEAD | > RESET_HEAD_RUN_POST_CHECKOUT_HOOK; > ropts.head_msg = msg.buf; > @@ -1799,7 +1793,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > * we just fast-forwarded. > */ > strbuf_reset(&msg); > - if (oideq(&merge_base, &options.orig_head)) { > + if (oideq(&merge_base, &options.orig_head->object.oid)) { > printf(_("Fast-forwarded %s to %s.\n"), > branch_name, options.onto_name); > strbuf_addf(&msg, "rebase finished: %s onto %s", > @@ -1820,7 +1814,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) > (options.restrict_revision ? > oid_to_hex(&options.restrict_revision->object.oid) : > oid_to_hex(&options.upstream->object.oid)), > - oid_to_hex(&options.orig_head)); > + oid_to_hex(&options.orig_head->object.oid)); > > options.revisions = revisions.buf; > > -- > gitgitgadget >
diff --git a/builtin/rebase.c b/builtin/rebase.c index 56e4214b441..6cf9c95f4e1 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -68,7 +68,7 @@ struct rebase_options { const char *upstream_name; const char *upstream_arg; char *head_name; - struct object_id orig_head; + struct commit *orig_head; struct commit *onto; const char *onto_name; const char *revisions; @@ -261,13 +261,13 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) struct replay_opts replay = get_replay_opts(opts); struct string_list commands = STRING_LIST_INIT_DUP; - if (get_revision_ranges(opts->upstream, opts->onto, &opts->orig_head, + if (get_revision_ranges(opts->upstream, opts->onto, &opts->orig_head->object.oid, &revisions, &shortrevisions)) return -1; if (init_basic_state(&replay, opts->head_name ? opts->head_name : "detached HEAD", - opts->onto, &opts->orig_head)) { + opts->onto, &opts->orig_head->object.oid)) { free(revisions); free(shortrevisions); @@ -298,9 +298,8 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags) split_exec_commands(opts->cmd, &commands); ret = complete_action(the_repository, &replay, flags, shortrevisions, opts->onto_name, opts->onto, - &opts->orig_head, &commands, opts->autosquash, - opts->update_refs, - &todo_list); + &opts->orig_head->object.oid, &commands, + opts->autosquash, opts->update_refs, &todo_list); } string_list_clear(&commands, 0); @@ -448,7 +447,8 @@ 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) return error(_("invalid orig-head: '%s'"), buf.buf); if (file_exists(state_dir_path("quiet", opts))) @@ -517,7 +517,7 @@ static int rebase_write_basic_state(struct rebase_options *opts) write_file(state_dir_path("onto", opts), "%s", opts->onto ? oid_to_hex(&opts->onto->object.oid) : ""); write_file(state_dir_path("orig-head", opts), "%s", - oid_to_hex(&opts->orig_head)); + oid_to_hex(&opts->orig_head->object.oid)); if (!(opts->flags & REBASE_NO_QUIET)) write_file(state_dir_path("quiet", opts), "%s", ""); if (opts->flags & REBASE_VERBOSE) @@ -646,7 +646,7 @@ static int run_am(struct rebase_options *opts) /* this is now equivalent to !opts->upstream */ &opts->onto->object.oid : &opts->upstream->object.oid), - oid_to_hex(&opts->orig_head)); + oid_to_hex(&opts->orig_head->object.oid)); rebased_patches = xstrdup(git_path("rebased-patches")); format_patch.out = open(rebased_patches, @@ -680,7 +680,7 @@ static int run_am(struct rebase_options *opts) free(rebased_patches); strvec_clear(&am.args); - ropts.oid = &opts->orig_head; + ropts.oid = &opts->orig_head->object.oid; ropts.branch = opts->head_name; ropts.default_reflog_action = DEFAULT_REFLOG_ACTION; reset_head(the_repository, &ropts); @@ -833,7 +833,7 @@ static int checkout_up_to_date(struct rebase_options *options) strbuf_addf(&buf, "%s: checkout %s", getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options->switch_to); - ropts.oid = &options->orig_head; + ropts.oid = &options->orig_head->object.oid; ropts.branch = options->head_name; ropts.flags = RESET_HEAD_RUN_POST_CHECKOUT_HOOK; if (!ropts.branch) @@ -866,15 +866,11 @@ static int is_linear_history(struct commit *from, struct commit *to) static int can_fast_forward(struct commit *onto, struct commit *upstream, struct commit *restrict_revision, - struct object_id *head_oid, struct object_id *merge_base) + struct commit *head, struct object_id *merge_base) { - struct commit *head = lookup_commit(the_repository, head_oid); struct commit_list *merge_bases = NULL; int res = 0; - if (!head) - goto done; - merge_bases = get_merge_bases(onto, head); if (!merge_bases || merge_bases->next) { oidcpy(merge_base, null_oid()); @@ -1312,13 +1308,13 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) if (read_basic_state(&options)) exit(1); - ropts.oid = &options.orig_head; + ropts.oid = &options.orig_head->object.oid; ropts.branch = options.head_name; ropts.flags = RESET_HEAD_HARD; ropts.default_reflog_action = DEFAULT_REFLOG_ACTION; if (reset_head(the_repository, &ropts) < 0) die(_("could not move back to %s"), - oid_to_hex(&options.orig_head)); + oid_to_hex(&options.orig_head->object.oid)); remove_branch_state(the_repository, 0); ret = finish_rebase(&options); goto cleanup; @@ -1610,17 +1606,17 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) /* 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) { die_if_checked_out(buf.buf, 1); options.head_name = xstrdup(buf.buf); /* 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); - oidcpy(&options.orig_head, &commit->object.oid); options.head_name = NULL; } } else if (argc == 0) { @@ -1639,8 +1635,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) FREE_AND_NULL(options.head_name); branch_name = "HEAD"; } - if (get_oid("HEAD", &options.orig_head)) - die(_("Could not resolve HEAD to a revision")); + options.orig_head = lookup_commit_reference_by_name("HEAD"); + if (!options.orig_head) + die(_("Could not resolve HEAD to a commit")); } else BUG("unexpected number of arguments left to parse"); @@ -1672,13 +1669,10 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) options.onto_name); } - if (options.fork_point > 0) { - struct commit *head = - lookup_commit_reference(the_repository, - &options.orig_head); + if (options.fork_point > 0) options.restrict_revision = - get_fork_point(options.upstream_name, head); - } + get_fork_point(options.upstream_name, options.orig_head); + if (repo_read_index(the_repository) < 0) die(_("could not read index")); @@ -1708,7 +1702,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) * call it before checking allow_preemptive_ff. */ if (can_fast_forward(options.onto, options.upstream, options.restrict_revision, - &options.orig_head, &merge_base) && + options.orig_head, &merge_base) && allow_preemptive_ff) { int flag; @@ -1785,7 +1779,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) strbuf_addf(&msg, "%s: checkout %s", getenv(GIT_REFLOG_ACTION_ENVIRONMENT), options.onto_name); ropts.oid = &options.onto->object.oid; - ropts.orig_head = &options.orig_head, + ropts.orig_head = &options.orig_head->object.oid, ropts.flags = RESET_HEAD_DETACH | RESET_ORIG_HEAD | RESET_HEAD_RUN_POST_CHECKOUT_HOOK; ropts.head_msg = msg.buf; @@ -1799,7 +1793,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) * we just fast-forwarded. */ strbuf_reset(&msg); - if (oideq(&merge_base, &options.orig_head)) { + if (oideq(&merge_base, &options.orig_head->object.oid)) { printf(_("Fast-forwarded %s to %s.\n"), branch_name, options.onto_name); strbuf_addf(&msg, "rebase finished: %s onto %s", @@ -1820,7 +1814,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) (options.restrict_revision ? oid_to_hex(&options.restrict_revision->object.oid) : oid_to_hex(&options.upstream->object.oid)), - oid_to_hex(&options.orig_head)); + oid_to_hex(&options.orig_head->object.oid)); options.revisions = revisions.buf;