From 5070b49e529e2df30ec2e33073267d281450dde6 Mon Sep 17 00:00:00 2001 From: Pieter de Bie Date: Sun, 25 May 2008 01:21:53 +0200 Subject: [PATCH] builtin-fast-export: Only output a single parent per line According to the git-fast-import man-page, you can only put a single committish per merge: line, like this: merge :10 merge :11 However, git-fast-export puts all parents on a single line, like this: merge :10 :11 This changes fast-export to output a single parent per line. Otherwise neither git-fast-import nor bzr-fast-import can read its output. [jc: fix-up to remove excess LF in the output that makes fast-import barf] Signed-off-by: Pieter de Bie Signed-off-by: Junio C Hamano --- builtin-fast-export.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/builtin-fast-export.c b/builtin-fast-export.c index 724cff35d..4bf5b58bf 100755 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -205,14 +205,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; -- 2.30.2