Merge branch 'ja/fetch-doc'

diff --git a/pretty.c b/pretty.c
index 3b2ecdd20e6f5bdca61ee5e605deac7b8239c70d..587101f846b945d7de219f468699e75565a7e9c0 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -583,7 +583,7 @@ static void format_decoration(struct strbuf *sb, const struct commit *commit)
        struct name_decoration *d;
        const char *prefix = " (";
 
-       load_ref_decorations();
+       load_ref_decorations(DECORATE_SHORT_REFS);
        d = lookup_decoration(&name_decoration, &commit->object);
        while (d) {
                strbuf_addstr(sb, prefix);
@@ -740,7 +740,7 @@ static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
 }
 
 void format_commit_message(const struct commit *commit,
-                          const void *format, struct strbuf *sb,
+                          const char *format, struct strbuf *sb,
                           enum date_mode dmode)
 {
        struct format_commit_context context;