diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-07-09 11:34:13 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-07-09 11:34:13 -0700 |
commit | ce8350f8ea8702a4983ce250f12b6f5def6bd7d9 (patch) | |
tree | c5630f7b648102e327f53b00b78706cae8d4dd17 /pretty.c | |
parent | 3b8e8af187cb86ed030432f1a067121fdd4b1c3b (diff) | |
parent | 958b2eb26c82f9d99d1fb4d3270601d0a18eaf38 (diff) | |
download | git-ce8350f8ea8702a4983ce250f12b6f5def6bd7d9.tar.gz |
Merge branch 'jk/pretty-G-format-fixes'
* 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.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1248,6 +1248,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; } |