summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-03-09 18:21:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-09 18:21:21 (GMT)
commit3658d77f8e563e77658d9e44df5e24f08ca99e3a (patch)
tree70c8cd2800aedabf607827d6b4f87a66d0fa6133 /log-tree.c
parent6125104b88e8bb0539b5d8a43bd0788922402724 (diff)
parent237a28173feffc9bdec5aa669aa17fba1ac7c279 (diff)
downloadgit-3658d77f8e563e77658d9e44df5e24f08ca99e3a.zip
git-3658d77f8e563e77658d9e44df5e24f08ca99e3a.tar.gz
git-3658d77f8e563e77658d9e44df5e24f08ca99e3a.tar.bz2
Merge branch 'hd/show-one-mergetag-fix'
"git show" and others gave an object name in raw format in its error output, which has been corrected to give it in hex. * hd/show-one-mergetag-fix: show_one_mergetag: print non-parent in hex form.
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c
index 5425ae9..5212742 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -516,7 +516,7 @@ static int show_one_mergetag(struct commit *commit,
"merged tag '%s'\n", tag->tag);
else if ((nth = which_parent(&tag->tagged->oid, commit)) < 0)
strbuf_addf(&verify_message, "tag %s names a non-parent %s\n",
- tag->tag, tag->tagged->oid.hash);
+ tag->tag, oid_to_hex(&tag->tagged->oid));
else
strbuf_addf(&verify_message,
"parent #%d, tagged '%s'\n", nth + 1, tag->tag);