aboutsummaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-16 11:17:21 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-16 11:17:21 -0700
commit588de86f06c897713d0a6b362629ff7d4911dd7c (patch)
tree0d166078bf7fba06c9b1bf548d7916bd23877216 /pretty.c
parent5a3db94539acbf66b9fcf466b5ea7fd53295dc89 (diff)
parent958b2eb26c82f9d99d1fb4d3270601d0a18eaf38 (diff)
downloadgit-588de86f06c897713d0a6b362629ff7d4911dd7c.tar.gz
git-588de86f06c897713d0a6b362629ff7d4911dd7c.tar.xz
Merge branch 'jk/pretty-G-format-fixes' into maint
"%G" (nothing after G) is an invalid pretty format specifier, but the parser did not notice it as garbage. * jk/pretty-G-format-fixes: move "%G" format test from t7510 to t6006 pretty: avoid reading past end-of-string with "%G" t7510: check %G* pretty-format output t7510: test a commit signed by an unknown key t7510: use consistent &&-chains in loop t7510: stop referring to master in later tests
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/pretty.c b/pretty.c
index 32099632f..f3e8b6c5b 100644
--- a/pretty.c
+++ b/pretty.c
@@ -1249,6 +1249,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
if (c->signature_check.key)
strbuf_addstr(sb, c->signature_check.key);
break;
+ default:
+ return 0;
}
return 2;
}