summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-06-01 21:03:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-01 21:03:07 (GMT)
commit6e1a7510b1dd830de69e174e409a40eb580c3ba7 (patch)
tree7490fed2b714dbe5a0659bff6286876fad1d67d3
parent2dd798469e5ca7792735475fa5844698a02cca70 (diff)
parenta6253d107734c7ffa6d939307d87cf496795dc78 (diff)
downloadgit-6e1a7510b1dd830de69e174e409a40eb580c3ba7.zip
git-6e1a7510b1dd830de69e174e409a40eb580c3ba7.tar.gz
git-6e1a7510b1dd830de69e174e409a40eb580c3ba7.tar.bz2
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pretty.c b/pretty.c
index 13618d8..7d23c1f 100644
--- 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);
}