diff options
author | Andy Koppe <andy.koppe@gmail.com> | 2023-10-08 22:23:07 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-10-09 20:25:13 +0200 |
commit | 2b09d16abac5c0cf389098a58f113f2053357dee (patch) | |
tree | 6c8a28f42e2dac4980c8dcfe122acf277d98b3a0 /pretty.c | |
parent | decorate: use commit color for HEAD arrow (diff) | |
download | git-2b09d16abac5c0cf389098a58f113f2053357dee.tar.xz git-2b09d16abac5c0cf389098a58f113f2053357dee.zip |
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 <andy.koppe@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pretty.c')
-rw-r--r-- | pretty.c | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -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; } } } |