diff options
| author | Taylor Blau <me@ttaylorr.com> | 2017-10-01 09:18:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-02 09:22:52 +0900 |
| commit | 84ff053d47c20c9f417f857e4adac0bcd8e01f0d (patch) | |
| tree | 8d46824980c9d3082724658a22f999bc41409317 /t | |
| parent | ea220ee40cbb03a63ebad2be902057bf742492fd (diff) | |
| download | git-84ff053d47c20c9f417f857e4adac0bcd8e01f0d.tar.gz git-84ff053d47c20c9f417f857e4adac0bcd8e01f0d.tar.xz | |
pretty.c: delimit "%(trailers)" arguments with ","
In preparation for adding consistent "%(trailers)" atom options to
`git-for-each-ref(1)`'s "--format" argument, change "%(trailers)" in
pretty.c to separate sub-arguments with a ",", instead of a ":".
Multiple sub-arguments are given either as "%(trailers:unfold,only)" or
"%(trailers:only,unfold)".
This change disambiguates between "top-level" arguments, and arguments
given to the trailers atom itself. It is consistent with the behavior of
"%(upstream)" and "%(push)" atoms.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4205-log-pretty-formats.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index ec5f53010..977472f53 100755 --- a/t/t4205-log-pretty-formats.sh +++ b/t/t4205-log-pretty-formats.sh @@ -588,8 +588,8 @@ test_expect_success '%(trailers:unfold) unfolds trailers' ' ' test_expect_success ':only and :unfold work together' ' - git log --no-walk --pretty="%(trailers:only:unfold)" >actual && - git log --no-walk --pretty="%(trailers:unfold:only)" >reverse && + git log --no-walk --pretty="%(trailers:only,unfold)" >actual && + git log --no-walk --pretty="%(trailers:unfold,only)" >reverse && test_cmp actual reverse && { grep -v patch.description <trailers | unfold && |