summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Taylor Blau <me@ttaylorr.com>2017-10-01 22:25:19 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-02 15:34:43 +0900
commit6f5c77a1190d83f0c02b480f0e04c0dd78d954ed (patch)
treecef362d1476e14af234d3263ea8d1e429dd85399
parentpretty.c: delimit "%(trailers)" arguments with "," (diff)
downloadtgif-6f5c77a1190d83f0c02b480f0e04c0dd78d954ed.tar.xz
t4205: unfold across multiple lines
Tests in t4205 test the following: git log --format='%(trailers:unfold)' ... By ensuring the multi-line trailers are unfolded back onto the same line. t4205 only includes tests for 2-line trailers, but `unfold()` will fail for folded trailers on 3 or more lines. In preparation for adding subsequent tests in t6300 that test similar behavior in `git-for-each-ref(1)`, let's harden t4205 (and make it consistent with the changes in t6300) by ensuring that 3 or more line folded trailers are unfolded correctly. Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t4205-log-pretty-formats.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 977472f539..591f35daaf 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -544,7 +544,7 @@ Signed-off-by: A U Thor
EOF
unfold () {
- perl -0pe 's/\n\s+/ /'
+ perl -0pe 's/\n\s+/ /g'
}
test_expect_success 'set up trailer tests' '