Merge branch 'jk/pretty-subject-cleanup'

[thirdparty/git.git] / pretty.c

diff --git a/pretty.c b/pretty.c
index 3df00bcf0495a89995fc40360d35f1825e7aadd8..eecbce82cf83b160a982259619f0ac7e885d17fe 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -1759,7 +1759,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
                                goto trailer_out;
                }
                if (*arg == ')') {
-                       format_trailers_from_commit(sb, msg + c->subject_off, &opts);
+                       format_trailers_from_commit(&opts, msg + c->subject_off, sb);
                        ret = arg - placeholder + 1;
                }
        trailer_out: