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

gitster · gitster · commit 6e1a7510b1dd · 2011-06-01T14:03:07.000-07:00
* jc/fmt-req-fix:
  userformat_find_requirements(): find requirement for the correct format
diff --git 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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1075,7 +1075,7 @@ void userformat_find_requirements(const char fmt, struct userformat_want w)`
`1075`	`1075`	`return;`
`1076`	`1076`	`fmt = user_format;`
`1077`	`1077`	`}`
`1078`		`- strbuf_expand(&dummy, user_format, userformat_want_item, w);`
	`1078`	`+ strbuf_expand(&dummy, fmt, userformat_want_item, w);`
`1079`	`1079`	`strbuf_release(&dummy);`
`1080`	`1080`	`}`
`1081`	`1081`