summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-01-10 10:32:39 -0800
committerJunio C Hamano <gitster@pobox.com>2014-01-10 10:32:39 -0800
commitf8c2e3f67133e82b1df9c4cc806ba5d67670e425 (patch)
tree390e58157ae4392d7bb2bfc478cd2fc929bc7400 /log-tree.c
parentc4bccea2d52dd59e0e6200cebba3df2dfcf593ea (diff)
parent5e1361ccdbfaf328b5bae1eae29f16ba965c54b1 (diff)
downloadgit-f8c2e3f67133e82b1df9c4cc806ba5d67670e425.tar.gz
Merge branch 'bc/log-decoration'
"git log --decorate" did not handle a tag pointed by another tag nicely. * bc/log-decoration: log: properly handle decorations with chained tags
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/log-tree.c b/log-tree.c
index 642faffdb7..08970bf46e 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -134,6 +134,8 @@ static int add_ref_decoration(const char *refname, const unsigned char *sha1, in
obj = ((struct tag *)obj)->tagged;
if (!obj)
break;
+ if (!obj->parsed)
+ parse_object(obj->sha1);
add_name_decoration(DECORATION_REF_TAG, refname, obj);
}
return 0;