summaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorLibravatar Christian Couder <christian.couder@gmail.com>2019-03-31 15:46:58 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-04-15 11:31:42 +0900
commitf8e44a81bf82ae35e37500f9597e93b0bdfc05e4 (patch)
tree0c504d4c8f098c802acd5ab6bbd5f004be74d9f8 /submodule.c
parentt6050: redirect expected error output to a file (diff)
downloadtgif-f8e44a81bf82ae35e37500f9597e93b0bdfc05e4.tar.xz
replace: peel tag when passing a tag as parent to --graft
When passing a tag as a parent argument to `git replace --graft`, it can be useful to accept it and use the underlying commit as a parent. This already works for lightweight tags, but unfortunately for annotated tags we have been using the hash of the tag object instead of the hash of the underlying commit as a parent in the replacement object we create. This created invalid objects, but the replace succeeded even if it showed an error like: error: object A is a tag, not a commit This patch fixes that by using the hash of the underlying commit when an annotated tag is passed. While at it, let's also update an error message to make it clearer. Reviewed-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
0 files changed, 0 insertions, 0 deletions