X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin%2Frev-list.c;h=51ceb19d88918445c90eccc37f1fe5f90cedd385;hb=443f26cbcac66368eb0ec8a8a250bf5815ad0a10;hp=5679170e82ed644d4c3eb4f71f26aa0ac9acce24;hpb=f1aa782a3b72a2c4de46dc93b484eb99dc01d4d0;p=git.git

diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 5679170e8..51ceb19d8 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);
@@ -313,7 +316,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 
 	git_config(git_default_config, NULL);
 	init_revisions(&revs, prefix);
-	revs.abbrev = 0;
+	revs.abbrev = DEFAULT_ABBREV;
 	revs.commit_format = CMIT_FMT_UNSPECIFIED;
 	argc = setup_revisions(argc, argv, &revs, NULL);