Merge branch 'maint-1.5.4' into maint

* maint-1.5.4: builtin-fast-export: Only output a single parent per line
git-mirror · May 26, 2008 · 6abf189 · 6abf189
2 parents 20bd3b0 + 5070b49
commit 6abf189
Showing 1 changed file with 1 addition and 5 deletions.
diff --git 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)
 			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;