log-tree: always use return value of strbuf_detach()
authorRené Scharfe <l.s.r@web.de>
Sun, 25 Aug 2019 12:53:26 +0000 (14:53 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Aug 2019 18:29:43 +0000 (11:29 -0700)
strbuf_detach() has been returning a pointer to a buffer even for empty
strbufs since 08ad56f3f0 ("strbuf: always return a non-NULL value from
strbuf_detach", 2012-10-18). Use that feature in show_log() instead of
having it handle empty strbufs specially.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
log-tree.c
index 1e56df62a79c0d221fa55ba351b6b16f8027d12b..109c212224ccf63facdcd5dd921b76e8068f9103 100644 (file)
@@ -677,9 +677,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);
        }
 
        /*