X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-fast-export.c;h=1dfc01e8f009968ef5d6118bffed7818e736576c;hb=ad5fa3cc0e115a8b111868af2f727322feb144cb;hp=e1c56303e5cb7882bc79980c4f8e6c6791ad323b;hpb=b81a7b58875e07d7e82aafced1de9834ba1ef94a;p=git.git

diff --git a/builtin-fast-export.c b/builtin-fast-export.c
index e1c56303e..1dfc01e8f 100755
--- 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;
@@ -372,7 +368,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 	};
 
 	/* we handle encodings */
-	git_config(git_default_config);
+	git_config(git_default_config, NULL);
 
 	init_revisions(&revs, prefix);
 	argc = setup_revisions(argc, argv, &revs, NULL);