X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=inline;f=rev-list.c;h=ce5b8b2ad528830eb0c6572edcdc55d97422952c;hb=9d34c29db39bdb5c2443475dd6a24cfc5c2c9e37;hp=1a03bf7b3754e1644f9a2cee80d9d09b563ee1ec;hpb=76cd8eb619cf2896b5171d46d6bbf8e97d19e728;p=git.git

diff --git a/rev-list.c b/rev-list.c
index 1a03bf7b..ce5b8b2a 100644
--- a/rev-list.c
+++ b/rev-list.c
@@ -63,7 +63,11 @@ static void show_commit(struct commit *commit)
 			parents = parents->next;
 		}
 	}
-	putchar('\n');
+	if (commit_format == CMIT_FMT_ONELINE)
+		putchar(' ');
+	else
+		putchar('\n');
+
 	if (verbose_header) {
 		static char pretty_header[16384];
 		pretty_print_commit(commit_format, commit->buffer, ~0, pretty_header, sizeof(pretty_header));
@@ -503,7 +507,10 @@ int main(int argc, char **argv)
 			commit_format = get_commit_format(arg+8);
 			verbose_header = 1;
 			hdr_termination = '\n';
-			prefix = "commit ";
+			if (commit_format == CMIT_FMT_ONELINE)
+				prefix = "";
+			else
+				prefix = "commit ";
 			continue;
 		}
 		if (!strncmp(arg, "--no-merges", 11)) {