Merge branch 'hd/show-one-mergetag-fix' into maint

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

diff --git a/log-tree.c b/log-tree.c
index f02343a4611087e2583f47b927f001e30d0d3435..32d17c941b6c15a26d444b8e7b4b1d494bed8a1d 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);
        }
 
        /*
@@ -771,7 +770,7 @@ void show_log(struct rev_info *opt)
                opts.use_color = opt->diffopt.use_color;
                diff_setup_done(&opts);
                show_range_diff(opt->rdiff1, opt->rdiff2,
-                               opt->creation_factor, 1, &opts);
+                               opt->creation_factor, 1, &opts, NULL);
 
                memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff));
        }