Merge branch 'maint-1.5.4' into maint

* maint-1.5.4: builtin-fast-export: Only output a single parent per line
17 years ago · 6abf189506
1 changed files with 1 additions and 5 deletions
--- a/builtin-fast-export.c
+++ b/builtin-fast-export.c
@ -204,14 +204,10 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
				@@ -204,14 +204,10 @@ static void handle_commit(struct commit *commit, struct rev_info *rev)
 			continue;
 		if (i == 0)
 			printf("from :%d\n", mark);
-		else if (i == 1)
-			printf("merge :%d", mark);
 		else
-			printf(" :%d", mark);
+			printf("merge :%d\n", mark);
 		i++;
 	}
-	if (i > 1)
-		printf("\n");

 	log_tree_diff_flush(rev);
 	rev->diffopt.output_format = saved_output_format;