summaryrefslogtreecommitdiff
path: root/builtin/multi-pack-index.c
diff options
context:
space:
mode:
authorPhillip Wood <phillip.wood@dunelm.org.uk>2021-09-21 10:24:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-22 19:04:52 (GMT)
commit7740ac691d8e7f1bed67bcbdb1ee5c5c618f7373 (patch)
tree636483021543997ae6993af19651e939401aa142 /builtin/multi-pack-index.c
parent1d188263e0847fd356d7ff245c32e8ebb29115b3 (diff)
downloadgit-7740ac691d8e7f1bed67bcbdb1ee5c5c618f7373.zip
git-7740ac691d8e7f1bed67bcbdb1ee5c5c618f7373.tar.gz
git-7740ac691d8e7f1bed67bcbdb1ee5c5c618f7373.tar.bz2
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/multi-pack-index.c')
0 files changed, 0 insertions, 0 deletions