From 2b09d16abac5c0cf389098a58f113f2053357dee Mon Sep 17 00:00:00 2001 From: Andy Koppe Date: Sun, 8 Oct 2023 21:23:07 +0100 Subject: pretty: fix ref filtering for %(decorate) formats Mark pretty formats containing "%(decorate" as requiring decoration in userformat_find_requirements(), same as "%d" and "%D". Without this, cmd_log_init_finish() didn't invoke load_ref_decorations() with the decoration_filter it puts together, and hence filtering options such as --decorate-refs were quietly ignored. Amend one of the %(decorate) checks in t4205-log-pretty-formats.sh to test this. Signed-off-by: Andy Koppe Signed-off-by: Junio C Hamano --- pretty.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'pretty.c') diff --git a/pretty.c b/pretty.c index 7f3abb676c..cf964b060c 100644 --- a/pretty.c +++ b/pretty.c @@ -1961,6 +1961,10 @@ void userformat_find_requirements(const char *fmt, struct userformat_want *w) case 'D': w->decorate = 1; break; + case '(': + if (starts_with(fmt + 1, "decorate")) + w->decorate = 1; + break; } } } -- cgit v1.2.3