summaryrefslogtreecommitdiff
path: root/builtin/rev-list.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-04-06 21:50:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-06 21:50:46 (GMT)
commitf9bdf9b2102bd848c7a3eabff2ba5af63828de54 (patch)
tree4274aed1bdfa89d04b1d028520a95d83f69f4521 /builtin/rev-list.c
parent15bf05241676a1870cbb82a46f509130627bb1d2 (diff)
parent1fb5fdd25f018480b48f6a74f06bad7e04866440 (diff)
downloadgit-f9bdf9b2102bd848c7a3eabff2ba5af63828de54.zip
git-f9bdf9b2102bd848c7a3eabff2ba5af63828de54.tar.gz
git-f9bdf9b2102bd848c7a3eabff2ba5af63828de54.tar.bz2
Merge branch 'ef/maint-empty-commit-log'
* ef/maint-empty-commit-log: rev-list: fix --pretty=oneline with empty message
Diffstat (limited to 'builtin/rev-list.c')
-rw-r--r--builtin/rev-list.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index eb8e2c2..51ceb19 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);