Merge branch 'ef/maint-empty-commit-log'

* ef/maint-empty-commit-log: rev-list: fix --pretty=oneline with empty message
2010-04-06 14:50:46 -07:00
parent 15bf052416 1fb5fdd25f
commit f9bdf9b210
2 changed files with 13 additions and 1 deletions
--- 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);