From: Junio C Hamano <gitster@pobox•com>
To: "Shawn O. Pearce" <spearce@spearce•org>
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: Sun, 25 May 2008 22:24:08 -0700 [thread overview]
Message-ID: <7vzlqdd4ef.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <7v7idhej6f.fsf@gitster.siamese.dyndns.org> (Junio C. Hamano's message of "Sun, 25 May 2008 22:19:36 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> "Shawn O. Pearce" <spearce@spearce•org> writes:
>
>> Junio C Hamano <gitster@pobox•com> 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;
next prev parent reply other threads:[~2008-05-26 5:25 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 [this message]
2008-05-26 5:30 ` Shawn O. Pearce
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=7vzlqdd4ef.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=pdebie@ai$(echo .)rug.nl \
--cc=spearce@spearce$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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