From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Pieter de Bie <pdebie@ai.rug.nl>,
git@vger.kernel.org, Johannes.Schindelin@gmx.de
Subject: Re: [PATCH] builtin-fast-export: Only output a single parent per line
Date: Mon, 26 May 2008 01:30:21 -0400 [thread overview]
Message-ID: <20080526053020.GD30245@spearce.org> (raw)
In-Reply-To: <7vzlqdd4ef.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> 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.
prev parent reply other threads:[~2008-05-26 5:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-24 23:21 [PATCH] builtin-fast-export: Only output a single parent per line Pieter de Bie
2008-05-25 1:38 ` Junio C Hamano
2008-05-26 1:49 ` Shawn O. Pearce
2008-05-26 5:19 ` Junio C Hamano
2008-05-26 5:24 ` Junio C Hamano
2008-05-26 5:30 ` Shawn O. Pearce [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080526053020.GD30245@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pdebie@ai.rug.nl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).