Junio C Hamano <gitster@xxxxxxxxx> wrote:
> > 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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
