Merge branch 'jc/fmt-req-fix'

* jc/fmt-req-fix: userformat_find_requirements(): find requirement for the correct format
2011-05-30 20:19:21 -07:00 · 2011-05-30 20:19:21 -07:00 · d98a20114d
commit d98a20114d
parent 1f9a980636 a6253d1077
1 changed files with 1 additions and 1 deletions
--- a/pretty.c
+++ b/pretty.c
@ -1084,7 +1084,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);
 }