git-log: do not output excess blank line between commits

Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago · d53352422b
1 changed files with 1 additions and 1 deletions
--- a/git.c
+++ b/git.c
@ -354,7 +354,7 @@ static int cmd_log(int argc, const char **argv, char **envp)
				@@ -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)