Merge branch 'dl/complete-rebase-and-archive'

[thirdparty/git.git] / log-tree.c

diff --git a/log-tree.c b/log-tree.c
index 1e56df62a79c0d221fa55ba351b6b16f8027d12b..923a299e704afe672b93aaa2d17f8c37d9c6a0fa 100644 (file)
--- a/log-tree.c
+++ b/log-tree.c
@@ -77,6 +77,7 @@ void add_name_decoration(enum decoration_type type, const char *name, struct obj
 
 const struct name_decoration *get_name_decoration(const struct object *obj)
 {
+       load_ref_decorations(NULL, DECORATE_SHORT_REFS);
        return lookup_decoration(&name_decoration, obj);
 }
 
@@ -677,9 +678,7 @@ void show_log(struct rev_info *opt)
                raw = (opt->commit_format == CMIT_FMT_USERFORMAT);
                format_display_notes(&commit->object.oid, &notebuf,
                                     get_log_output_encoding(), raw);
-               ctx.notes_message = notebuf.len
-                       ? strbuf_detach(&notebuf, NULL)
-                       : xcalloc(1, 1);
+               ctx.notes_message = strbuf_detach(&notebuf, NULL);
        }
 
        /*