From 9130ac9fe17831445690ebbb60f09b86f96516b3 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 7 Oct 2010 14:25:43 -0400 Subject: [PATCH] rev-list: handle %x00 NUL in user format The code paths for showing commits in "git log" and "git rev-list --graph" correctly handle embedded NULs by looking only at the resulting strbuf's length, and never treating it as a C string. The code path for regular rev-list, however, used printf("%s"), which resulted in truncated output. This patch uses fwrite instead, like the --graph code path. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- builtin/rev-list.c | 6 ++++-- t/t4012-diff-binary.sh | 4 ---- t/t6006-rev-list-format.sh | 8 ++++++++ t/test-lib.sh | 4 ++++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/builtin/rev-list.c b/builtin/rev-list.c index efe9360e2..3b2dca080 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -147,8 +147,10 @@ static void show_commit(struct commit *commit, void *data) } } else { if (revs->commit_format != CMIT_FMT_USERFORMAT || - buf.len) - printf("%s%c", buf.buf, info->hdr_termination); + buf.len) { + fwrite(buf.buf, 1, buf.len, stdout); + putchar(info->hdr_termination); + } } strbuf_release(&buf); } else { diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index bc46563af..05ec06283 100755 --- a/t/t4012-diff-binary.sh +++ b/t/t4012-diff-binary.sh @@ -77,10 +77,6 @@ test_expect_success 'apply binary patch' \ tree1=`git write-tree` && test "$tree1" = "$tree0"' -nul_to_q() { - perl -pe 'y/\000/Q/' -} - test_expect_success 'diff --no-index with binary creation' ' echo Q | q_to_nul >binary && (: hide error code from diff, which just indicates differences diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index cccacd4ad..d918cc02d 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -162,6 +162,14 @@ commit 131a310eb913d107dd3c09a65d1651175898735d commit 86c75cfd708a0e5868dc876ed5b8bb66c80b4873 EOF +test_expect_success '%x00 shows NUL' ' + echo >expect commit f58db70b055c5718631e5c61528b28b12090cdea && + echo >>expect fooQbar && + git rev-list -1 --format=foo%x00bar HEAD >actual.nul && + nul_to_q actual && + test_cmp expect actual +' + test_expect_success '%ad respects --date=' ' echo 2005-04-07 >expect.ad-short && git log -1 --date=short --pretty=tformat:%ad >output.ad-short master && diff --git a/t/test-lib.sh b/t/test-lib.sh index 830e5e736..25f8bf95c 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -248,6 +248,10 @@ test_decode_color () { -e 's/.\[m//g' } +nul_to_q () { + perl -pe 'y/\000/Q/' +} + q_to_nul () { perl -pe 'y/Q/\000/' } -- 2.30.2