mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
Merge branch 'ef/maint-empty-commit-log'
* ef/maint-empty-commit-log: rev-list: fix --pretty=oneline with empty message
This commit is contained in:
commit
f9bdf9b210
|
@ -133,9 +133,12 @@ static void show_commit(struct commit *commit, void *data)
|
||||||
*/
|
*/
|
||||||
if (graph_show_remainder(revs->graph))
|
if (graph_show_remainder(revs->graph))
|
||||||
putchar('\n');
|
putchar('\n');
|
||||||
|
if (revs->commit_format == CMIT_FMT_ONELINE)
|
||||||
|
putchar('\n');
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (buf.len)
|
if (revs->commit_format != CMIT_FMT_USERFORMAT ||
|
||||||
|
buf.len)
|
||||||
printf("%s%c", buf.buf, info->hdr_termination);
|
printf("%s%c", buf.buf, info->hdr_termination);
|
||||||
}
|
}
|
||||||
strbuf_release(&buf);
|
strbuf_release(&buf);
|
||||||
|
|
|
@ -209,4 +209,13 @@ test_expect_success '%gd shortens ref name' '
|
||||||
test_cmp expect.gd-short actual.gd-short
|
test_cmp expect.gd-short actual.gd-short
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'oneline with empty message' '
|
||||||
|
git commit -m "dummy" --allow-empty &&
|
||||||
|
git commit -m "dummy" --allow-empty &&
|
||||||
|
git filter-branch --msg-filter "sed -e s/dummy//" HEAD^^.. &&
|
||||||
|
git rev-list --oneline HEAD > /tmp/test.txt &&
|
||||||
|
test $(git rev-list --oneline HEAD | wc -l) -eq 5 &&
|
||||||
|
test $(git rev-list --oneline --graph HEAD | wc -l) -eq 5
|
||||||
|
'
|
||||||
|
|
||||||
test_done
|
test_done
|
||||||
|
|
Loading…
Reference in a new issue