summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorHarald van Dijk <harald@gigawatt.nl>2020-02-29 13:07:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-02 20:34:00 (GMT)
commit237a28173feffc9bdec5aa669aa17fba1ac7c279 (patch)
treeb1733ece07384ae88acf34c6bf89599a3792b5c1 /log-tree.c
parentd9589d4051537c387b70dc76e430c61b4c85a86d (diff)
downloadgit-237a28173feffc9bdec5aa669aa17fba1ac7c279.zip
git-237a28173feffc9bdec5aa669aa17fba1ac7c279.tar.gz
git-237a28173feffc9bdec5aa669aa17fba1ac7c279.tar.bz2
show_one_mergetag: print non-parent in hex form.
When a mergetag names a non-parent, which can occur after a shallow clone, its hash was previously printed as raw data. Print it in hex form instead. Signed-off-by: Harald van Dijk <harald@gigawatt.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 1e56df6..f02343a 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -514,7 +514,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);