diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2021-09-21 10:24:07 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-09-22 12:04:52 -0700 |
| commit | 7740ac691d8e7f1bed67bcbdb1ee5c5c618f7373 (patch) | |
| tree | 636483021543997ae6993af19651e939401aa142 /builtin | |
| parent | rebase: use lookup_commit_reference_by_name() (diff) | |
| download | tgif-7740ac691d8e7f1bed67bcbdb1ee5c5c618f7373.tar.xz | |
rebase: dereference tags
A rebase started with 'git rebase <A> <B>' is conceptually to first
checkout <B> and run 'git rebase <A>' starting from that state. 'git
rebase --abort' in the middle of such a rebase should take us back to
the state we checked out <B>.
This used to work, even when <B> is a tag that points at a commit,
until Git 2.20.0 when the command was reimplemented in C. The command
now complains that the tag object itself cannot be checked out, which
may be technically correct but is not what the user asked to do.
Fix this old regression by using lookup_commit_reference_by_name()
when parsing <B>. The scripted version did not need to peel the tag
because the commands it passed the tag to (e.g 'git reset') peeled the
tag themselves.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index e89e21d0f2..f82bfaed11 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -1905,13 +1905,15 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) die_if_checked_out(buf.buf, 1); options.head_name = xstrdup(buf.buf); /* If not is it a valid ref (branch or commit)? */ - } else if (!get_oid(branch_name, &options.orig_head) && - lookup_commit_reference(the_repository, - &options.orig_head)) + } else { + struct commit *commit = + lookup_commit_reference_by_name(branch_name); + if (!commit) + die(_("no such branch/commit '%s'"), + branch_name); + oidcpy(&options.orig_head, &commit->object.oid); options.head_name = NULL; - else - 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 = |