From: Junio C Hamano Date: Mon, 26 May 2008 05:24:08 GMT Subject: Re: [PATCH] builtin-fast-export: Only output a single parent per line Message-ID: <7vzlqdd4ef.fsf@gitster.siamese.dyndns.org> In-Reply-To: <7v7idhej6f.fsf@gitster.siamese.dyndns.org> Junio C Hamano writes: > "Shawn O. Pearce" writes: > >> Junio C Hamano wrote: >> ... >>> Is it fine for even git-fast-import? fast-import.c: parse_merge() seems >>> to suggest that it also wants one parent per "merge " line. >> >> fast-import wants the same as bzr-fast-import; one parent per >> merge line. If git-fast-import was doing anything with multiple >> per line it was probably dropping everything after the first. :-( >> >> This was a bug in fast-export; I'm glad Pieter has fixed it. > > Unfortunately, t9301 does not pass with the "fix". Perhaps, this is needed on top? builtin-fast-export.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/builtin-fast-export.c b/builtin-fast-export.c index 4d28cf7..4bf5b58 100755 --- a/builtin-fast-export.c +++ b/builtin-fast-export.c @@ -209,8 +209,6 @@ static void handle_commit(struct commit *commit, struct rev_info *rev) printf("merge :%d\n", mark); i++; } - if (i > 1) - printf("\n"); log_tree_diff_flush(rev); rev->diffopt.output_format = saved_output_format;