summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-13 07:26:21 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-13 07:26:21 (GMT)
commitd53352422b5f2ac3cfb86f5f363d6f167824ac52 (patch)
treebf002cc062e7661266f8657e539cfd8b6383a13f
parent8c989ec5288021e07c265882f86ac3999b44c142 (diff)
downloadgit-d53352422b5f2ac3cfb86f5f363d6f167824ac52.zip
git-d53352422b5f2ac3cfb86f5f363d6f167824ac52.tar.gz
git-d53352422b5f2ac3cfb86f5f363d6f167824ac52.tar.bz2
git-log: do not output excess blank line between commits
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--git.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/git.c b/git.c
index 5cb0d32..d6f17db 100644
--- a/git.c
+++ b/git.c
@@ -354,7 +354,7 @@ static int cmd_log(int argc, const char **argv, char **envp)
prepare_revision_walk(&rev);
setup_pager();
while ((commit = get_revision(&rev)) != NULL) {
- if (commit_format != CMIT_FMT_ONELINE && shown)
+ if (shown && do_diff && commit_format != CMIT_FMT_ONELINE)
putchar('\n');
fputs(commit_prefix, stdout);
if (abbrev_commit && abbrev)