diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-06-01 14:03:07 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-06-01 14:03:07 -0700 |
commit | 6e1a7510b1dd830de69e174e409a40eb580c3ba7 (patch) | |
tree | 7490fed2b714dbe5a0659bff6286876fad1d67d3 | |
parent | 2dd798469e5ca7792735475fa5844698a02cca70 (diff) | |
parent | a6253d107734c7ffa6d939307d87cf496795dc78 (diff) | |
download | git-6e1a7510b1dd830de69e174e409a40eb580c3ba7.tar.gz git-6e1a7510b1dd830de69e174e409a40eb580c3ba7.tar.xz |
Merge branch 'jc/fmt-req-fix' into maint
* jc/fmt-req-fix:
userformat_find_requirements(): find requirement for the correct format
-rw-r--r-- | pretty.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); } |