aboutsummaryrefslogtreecommitdiffstats
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-10-20 16:23:11 -0700
committerJunio C Hamano <gitster@pobox.com>2023-10-20 16:23:11 -0700
commit92741d83c06b4cd0a15f43e23e4456604096cb0c (patch)
tree40e4848242522403ab8d298e77e1f4ecbd3bb4fd /pretty.c
parentMerge branch 'vd/loose-ref-iteration-optimization' (diff)
parentpretty: fix ref filtering for %(decorate) formats (diff)
downloadgit-92741d83c06b4cd0a15f43e23e4456604096cb0c.tar.gz
git-92741d83c06b4cd0a15f43e23e4456604096cb0c.zip
Merge branch 'ak/pretty-decorate-more-fix'
Unlike "git log --pretty=%D", "git log --pretty="%(decorate)" did not auto-initialize the decoration subsystem, which has been corrected. * ak/pretty-decorate-more-fix: pretty: fix ref filtering for %(decorate) formats
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c4
1 files changed, 4 insertions, 0 deletions
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;
}
}
}