diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-09 22:38:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-09 22:38:53 -0700 |
| commit | 408dee5222fd732ac8d59d4d95ee47f5662150d2 (patch) | |
| tree | 9ebe7c427b42940b7c770cfe0d782692ace523da | |
| parent | Merge branch 'jc/conflict-marker-size' into maint (diff) | |
| parent | rev-list: fix --pretty=oneline with empty message (diff) | |
| download | tgif-408dee5222fd732ac8d59d4d95ee47f5662150d2.tar.xz | |
Merge branch 'ef/maint-empty-commit-log' into maint
* ef/maint-empty-commit-log:
rev-list: fix --pretty=oneline with empty message
| -rw-r--r-- | builtin-rev-list.c | 5 | ||||
| -rwxr-xr-x | t/t6006-rev-list-format.sh | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/builtin-rev-list.c b/builtin-rev-list.c index 5679170e82..1db4b4ccc6 100644 --- a/builtin-rev-list.c +++ b/builtin-rev-list.c @@ -133,9 +133,12 @@ static void show_commit(struct commit *commit, void *data) */ if (graph_show_remainder(revs->graph)) putchar('\n'); + if (revs->commit_format == CMIT_FMT_ONELINE) + putchar('\n'); } } else { - if (buf.len) + if (revs->commit_format != CMIT_FMT_USERFORMAT || + buf.len) printf("%s%c", buf.buf, info->hdr_termination); } strbuf_release(&buf); diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh index b0047d3c6b..d24ca5c077 100755 --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@ -209,4 +209,13 @@ test_expect_success '%gd shortens ref name' ' 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 |