Merge branch 'jc/fmt-req-fix' into maint

* jc/fmt-req-fix:
userformat_find_requirements(): find requirement for the correct format

diff --git a/pretty.c b/pretty.c
index 13618d82644b72adc6068add826daa72dfe64f38..7d23c1f8481af3cfd73c76c76fb2e13a2a7e4a9c 100644 (file)
--- a/pretty.c
+++ b/pretty.c
@@ -1075,7 +1075,7 @@ void userformat_find_requirements(const char *fmt, struct userformat_want *w)
                        return;
                fmt = user_format;
        }
-       strbuf_expand(&dummy, user_format, userformat_want_item, w);
+       strbuf_expand(&dummy, fmt, userformat_want_item, w);
        strbuf_release(&dummy);
 }