diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-10-07 16:27:52 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-10-07 16:27:52 +0900 |
| commit | 436b35942cb5198a8d5e915690e65ee1c860baf2 (patch) | |
| tree | 09adc7fff2cd846632f0ded9b9a3ac985b44f162 /t | |
| parent | 217f2767cbcb562872437eed4dec62e00846d90c (diff) | |
| parent | 84ff053d47c20c9f417f857e4adac0bcd8e01f0d (diff) | |
| download | git-436b35942cb5198a8d5e915690e65ee1c860baf2.tar.gz git-436b35942cb5198a8d5e915690e65ee1c860baf2.tar.xz | |
Merge branch 'tb/delimit-pretty-trailers-args-with-comma'
The feature that allows --pretty='%(trailers)' to take modifiers
like "fold" and "only" used to separate these modifiers with a
comma, i.e. "%(trailers:fold:only)", but we changed our mind and
use a comma, i.e. "%(trailers:fold,only)". Fast track this change
before this new feature becomes part of any official release.
* tb/delimit-pretty-trailers-args-with-comma:
pretty.c: delimit "%(trailers)" arguments with ","
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 && |