Skip to content

Commit a6253d1

Browse files
committed
userformat_find_requirements(): find requirement for the correct format
This function was introduced in 5b16360 (pretty: Initialize notes if %N is used, 2010-04-13) to check what kind of information the "log --format=..." user format string wants. The function can be passed a NULL instead of a format string to ask it to check user_format variable kept by an earlier call to save_user_format(). But it unconditionally checked user_format and not the string it was given. The only caller introduced by the change passes NULL, which kept the bug unnoticed, until a new GCC noticed that there is an assignment to fmt that is never used. Noticed-by: Chris Wilson's compiler Signed-off-by: Junio C Hamano <[email protected]> Acked-by: Jeff King <[email protected]>
1 parent 9963e02 commit a6253d1

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

pretty.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,7 @@ void userformat_find_requirements(const char *fmt, struct userformat_want *w)
10751075
return;
10761076
fmt = user_format;
10771077
}
1078-
strbuf_expand(&dummy, user_format, userformat_want_item, w);
1078+
strbuf_expand(&dummy, fmt, userformat_want_item, w);
10791079
strbuf_release(&dummy);
10801080
}
10811081

0 commit comments

Comments
 (0)