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

* jc/fmt-req-fix: userformat_find_requirements(): find requirement for the correct format
2011-06-01 14:03:07 -07:00 · 2011-06-01 14:03:07 -07:00 · 6e1a7510b1
parent 2dd798469e a6253d1077
commit 6e1a7510b1
1 changed files with 1 additions and 1 deletions
--- 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);
 }