Re: [PATCH] builtin-fast-export: Only output a single parent per line
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- May 26, 2008, 05:30 UTC
- Message-ID
- <20080526053020.GD30245@spearce.org>
- In-Reply-To
- <7vzlqdd4ef.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> wrote:
Show 20 quoted lines
> > 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;Yea, that looks right. The LF shouldn't follow the last merge command.
-- Shawn.