diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-17 15:02:24 -0700 |
| commit | 41d910ea6ce58b2d7322f7bff5877ead33f34b8c (patch) | |
| tree | 9c9a2ef93a7e42277850aa5571c8ad8f66bb3ba6 /log-tree.c | |
| parent | Merge branch 'am/mingw-poll-fix' into maint (diff) | |
| parent | show_one_mergetag: print non-parent in hex form. (diff) | |
| download | tgif-41d910ea6ce58b2d7322f7bff5877ead33f34b8c.tar.xz | |
Merge branch 'hd/show-one-mergetag-fix' into maint
"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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/log-tree.c b/log-tree.c index 151e12f415..32d17c941b 100644 --- a/log-tree.c +++ b/log-tree.c @@ -515,7 +515,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); |