diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-26 23:14:51 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-26 23:14:51 +0300 |
| commit | d347fb6596f687521543f688667f53a772724d11 (patch) | |
| tree | a3569fd098849812533d82657aee0681cd4e274c /t | |
| parent | 78498729e4523d5ee32508262cc70d7a41097bc8 (diff) | |
| parent | 98985c6911ca0d475ae7b4e5401e6eae58ed8489 (diff) | |
Merge branch 'jk/diff-submodule-diff-inline'
A recently graduated topic regressed "git rev-list --header"
output, breaking "gitweb". This has been fixed.
* jk/diff-submodule-diff-inline:
rev-list: use hdr_termination instead of a always using a newline
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6000-rev-list-misc.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh index 3e752ce032..969e4e9e52 100755 --- a/t/t6000-rev-list-misc.sh +++ b/t/t6000-rev-list-misc.sh @@ -100,4 +100,18 @@ test_expect_success '--bisect and --first-parent can not be combined' ' test_must_fail git rev-list --bisect --first-parent HEAD ' +test_expect_success '--header shows a NUL after each commit' ' + # We know that there is no Q in the true payload; names and + # addresses of the authors and the committers do not have + # any, and object names or header names do not, either. + git rev-list --header --max-count=2 HEAD | + nul_to_q | + grep "^Q" >actual && + cat >expect <<-EOF && + Q$(git rev-parse HEAD~1) + Q + EOF + test_cmp expect actual +' + test_done |