Fix in-place editing functions in convert.c

diff --git a/commit.c b/commit.c
index 55b08ec0b93040785792afbe0c4013fe410a9d40..20fb2209cbcbc19343e7e52378e74afef52e3a6e 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -663,7 +663,7 @@ static char *replace_encoding_header(char *buf, const char *encoding)
                                          len - strlen("encoding \n"),
                                          encoding, strlen(encoding));
        }
-       return tmp.buf;
+       return strbuf_detach(&tmp, NULL);
 }
 
 static char *logmsg_reencode(const struct commit *commit,
@@ -876,9 +876,6 @@ void format_commit_message(const struct commit *commit,
        }
        if (msg[i])
                table[IBODY].value = xstrdup(msg + i);
-       for (i = 0; i < ARRAY_SIZE(table); i++)
-               if (!table[i].value)
-                       interp_set_entry(table, i, "<unknown>");
 
        len = interpolate(sb->buf + sb->len, strbuf_avail(sb),
                                format, table, ARRAY_SIZE(table));