diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-20 16:23:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-20 16:23:11 -0700 |
| commit | 92741d83c06b4cd0a15f43e23e4456604096cb0c (patch) | |
| tree | 40e4848242522403ab8d298e77e1f4ecbd3bb4fd | |
| parent | Merge branch 'vd/loose-ref-iteration-optimization' (diff) | |
| parent | pretty: fix ref filtering for %(decorate) formats (diff) | |
| download | git-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
| -rw-r--r-- | pretty.c | 4 | ||||
| -rwxr-xr-x | t/t4205-log-pretty-formats.sh | 6 |
2 files changed, 7 insertions, 3 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; } } } diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index 62c7bfed5d..e3d655e6b8 100755 --- a/t/t4205-log-pretty-formats.sh +++ b/t/t4205-log-pretty-formats.sh @@ -590,9 +590,9 @@ test_expect_success 'pretty format %decorate' ' git log --format="%(decorate:prefix=,suffix=)" -1 >actual2 && test_cmp expect2 actual2 && - echo "[ HEAD -> foo; tag: bar; qux ]" >expect3 && - git log --format="%(decorate:prefix=[ ,suffix= ],separator=%x3B )" \ - -1 >actual3 && + echo "[ bar; qux; foo ]" >expect3 && + git log --format="%(decorate:prefix=[ ,suffix= ],separator=%x3B ,tag=)" \ + --decorate-refs=refs/ -1 >actual3 && test_cmp expect3 actual3 && # Try with a typo (in "separator"), in which case the placeholder should |