summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2014-06-17 00:07:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-17 20:41:41 (GMT)
commitaa4b78d483a918ebee810993e420b4697b0de4d3 (patch)
tree906dc9439e162ce18b6bdb5e67c0076b408f14a3 /t
parent06ca0f45a063f7186cce96a58a5fb6bef16ec204 (diff)
downloadgit-aa4b78d483a918ebee810993e420b4697b0de4d3.zip
git-aa4b78d483a918ebee810993e420b4697b0de4d3.tar.gz
git-aa4b78d483a918ebee810993e420b4697b0de4d3.tar.bz2
pretty: avoid reading past end-of-string with "%G"
If the user asks for --format=%G with nothing else, we correctly realize that "%G" is not a valid placeholder (it should be "%G?", "%GK", etc). But we still tell the strbuf_expand code that we consumed 2 characters, causing it to jump over the trailing NUL and output garbage. This also fixes the case where "%GX" would be consumed (and produce no output). In other cases, we pass unrecognized placeholders through to the final string. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t7510-signed-commit.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index e97477a..9810242 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -147,4 +147,10 @@ test_expect_success GPG 'show lack of signature with custom format' '
test_cmp expect actual
'
+test_expect_success 'unused %G placeholders are passed through' '
+ echo "%GX %G" >expect &&
+ git log -1 --format="%GX %G" >actual &&
+ test_cmp expect actual
+'
+
test_done