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 /t/t6006-rev-list-format.sh | |
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 't/t6006-rev-list-format.sh')
-rwxr-xr-x | t/t6006-rev-list-format.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index c277db64f7..88ed3191e8 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -468,4 +468,10 @@ test_expect_success 'single-character name is parsed correctly' ' 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 |