From: "Shawn O. Pearce" <spearce@spearce.org>
To: Jan Hudec <bulb@ucw.cz>
Cc: Johannes Sixt <j.sixt@viscovery.net>, git@vger.kernel.org
Subject: Re: Ad: fast-import problem importing dos format files under cygwin
Date: Wed, 3 Dec 2008 08:04:46 -0800 [thread overview]
Message-ID: <20081203160446.GY23984@spearce.org> (raw)
In-Reply-To: <51143.194.138.12.144.1228311791.squirrel@artax.karlin.mff.cuni.cz>
Jan Hudec <bulb@ucw.cz> wrote:
> Dne 3 Prosinec 2008, 13:18, Johannes Sixt napsal(a):
> > Jan Hudec schrieb:
> >> On 3 December 2008, 08:51, Jan Hudec wrote:
> >>> Hello folks,
> >>>
> >>> I have been playing with fast-import in cygwin and I have problems
> >>> importing files with CR/LF line-endings. The size in data command is
> >>> calculated including the CRs and than the file is copied binary to the
> >>> fast-import input stream. However fast-import skips the CRs when
> >>> reading,
> >>> overreads by that number of bytes and fails when it tries to read the
> >>> next command from the middle.
> >
> > Do you happen to have core.autocrlf set in some way and could it make a
> > difference for fast-import? I have it unset.
>
> I have it set to false explicitly in global config. Tried with not having
> it set at all and gives the same problem. Since the previous version of
> MSys Git worked for me, I suspect it's somehow cygwin-related.
Huh. So fast-import *never* does auto-CRLF conversion, even if the
property is set. It just doesn't make those calls internally.
It blindly copies data from the input stream into the pack.
No exceptions.
fast-import under-reading near CRs and getting misaligned on its
input indicates that the stdio library has given us a FILE* for stdin
which is converting CRLF pairs into LFs, even within an fread() call.
My guess here is fast-import's stdin is set in text mode, but it
really needs to be in binary mode. fast-import.c never attempts
to correct that when it starts, so on DOS based systems we are
probably totally screwed from the beginning...
--
Shawn.
next prev parent reply other threads:[~2008-12-03 16:06 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-03 7:51 fast-import problem importing dos format files under cygwin Jan Hudec
2008-12-03 9:10 ` Ad: " Jan Hudec
2008-12-03 12:18 ` Johannes Sixt
2008-12-03 13:43 ` Jan Hudec
2008-12-03 16:04 ` Shawn O. Pearce [this message]
2008-12-03 16:20 ` Johannes Schindelin
2008-12-03 18:05 ` Jan Hudec
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=20081203160446.GY23984@spearce.org \
--to=spearce@spearce.org \
--cc=bulb@ucw.cz \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.