undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/diff-submodule-diff-inline'

Browse Source 
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
This commit is contained in:
Junio C Hamano 2016-10-26 13:14:51 -07:00
commit d347fb6596
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/rev-list.c
View File

@ -145,7 +145,7 @@ static void show_commit(struct commit *commit, void *data)
*/ */
if (buf.len && buf.buf[buf.len - 1] == '\n') if (buf.len && buf.buf[buf.len - 1] == '\n')
graph_show_padding(revs->graph); graph_show_padding(revs->graph);
putchar('\n'); putchar(info->hdr_termination);
} else { } else {
/* /*
* If the message buffer is empty, just show * If the message buffer is empty, just show

14
t/t6000-rev-list-misc.sh
View File

@ -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_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 test_done