From: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
To: Jeff King <peff@peff.net>
Cc: Johannes Sixt <j6t@kdbg.org>,
Erik Faye-Lund <kusmabite@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [PATCH v2 4/4] upload-archive: use start_command instead of fork
Date: Tue, 02 Aug 2011 18:46:20 +0200 [thread overview]
Message-ID: <4E3829DC.8070802@lsrfire.ath.cx> (raw)
In-Reply-To: <20110802040004.GC17494@sigill.intra.peff.net>
Am 02.08.2011 06:00, schrieb Jeff King:
> On Mon, Aug 01, 2011 at 11:52:43PM +0200, René Scharfe wrote:
>
>> Am 01.08.2011 23:20, schrieb Johannes Sixt:
>>> Am 01.08.2011 22:48, schrieb René Scharfe:
>>>> So git archive gives the right results when writing to a pipe, but
>>>> always the same wrong result when writing directly to a file.
>>>
>>> This could indeed be a CRLF issue. archive-tar.c runs gzip to let it
>>> write to the original fd 1 (stdout). gzip is an MSYS program, and MSYS
>>> is "clever" and sets up the channel in text mode (CRLF conversion) if it
>>> is a regular file, but in binary mode if it is a pipe.
>>>
>>> Without the gzip filter, git-archive writes to stdout itself. Since we
>>> have set up all our channels in binary mode, we do not suffer from the
>>> same problem for plain tar format.
>>>
>>> So, I don't think we can do a lot about it, short of patching MSYS again...
>>
>> Or we could pipe the output through us, i.e. attach a builtin version of
>> cat at the output end of the called command. Only on Windows, of
>> course. Better ugly and limping then wrong, right?
>
> Yeah, that would work. But I am confused. If what Johannes says is true,
> isn't MSYS gzip totally broken for:
>
> # works
> echo foo | gzip -c | cat >foo.gz
>
> # broken; introduces CR
> echo foo | gzip -c >foo.gz
>
> ? (The "works" and "broken" there are my guesses; I don't have a Windows
> box to test on). IOW, is it simply gzip that is broken, and any fix we
> do is simply working around a bug in gzip? And therefore the right
> solution is for MSYS people to fix gzip?
"foo" may be too short to trigger the issue as the small resulting gz
file has a low probability of containing LFs.
The output of gzip is not simply always mangled, though (taken from my
earlier email, all three are working):
$ git archive v1.7.6 | gzip -cn | md5sum
a0ca1c873a533a5fcd41d248fb325a5b *-
$ git archive --format=tar.gz v1.7.6 | md5sum
a0ca1c873a533a5fcd41d248fb325a5b *-
$ git archive v1.7.6 | gzip -cn >a.tgz && md5sum <a.tgz
a0ca1c873a533a5fcd41d248fb325a5b *-
It's only broken if we call it from git archive:
$ git archive --format=tar.gz v1.7.6 >a.tgz && md5sum <a.tgz
30886283af1aed05ae6a36fc5aeda077 *-
$ git archive -o a.tgz v1.7.6 && md5sum <a.tgz
30886283af1aed05ae6a36fc5aeda077 *-
But not if we stuff the result into a pipe instead of a file:
$ git archive --format=tar.gz v1.7.6 | cat >a.tgz && md5sum <a.tgz
a0ca1c873a533a5fcd41d248fb325a5b *-
It _is_ confusing.
René
next prev parent reply other threads:[~2011-08-02 16:46 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-18 18:08 [PATCH v2 0/4] port upload-archive to Windows Erik Faye-Lund
2011-07-18 18:08 ` [PATCH v2 1/4] compat/win32/sys/poll.c: upgrade from upstream Erik Faye-Lund
2011-07-18 18:08 ` [PATCH v2 2/4] mingw: fix compilation of poll-emulation Erik Faye-Lund
2011-07-18 18:08 ` [PATCH v2 3/4] enter_repo: do not modify input Erik Faye-Lund
2011-07-18 18:08 ` [PATCH v2 4/4] upload-archive: use start_command instead of fork Erik Faye-Lund
2011-07-19 21:09 ` Junio C Hamano
2011-07-28 8:32 ` Erik Faye-Lund
2011-07-28 16:08 ` Jeff King
2011-07-28 16:47 ` Jeff King
2011-07-28 17:02 ` Jeff King
2011-08-01 14:45 ` Erik Faye-Lund
2011-08-01 17:46 ` Jeff King
2011-08-01 18:02 ` Erik Faye-Lund
2011-08-01 18:25 ` Jeff King
2011-08-01 20:48 ` René Scharfe
2011-08-01 21:20 ` Johannes Sixt
2011-08-01 21:42 ` René Scharfe
2011-08-01 21:52 ` René Scharfe
2011-08-02 4:00 ` Jeff King
2011-08-02 16:46 ` René Scharfe [this message]
2011-08-02 18:13 ` Jeff King
2011-08-02 23:37 ` Johannes Sixt
2011-08-03 5:49 ` Jeff King
2011-08-06 9:40 ` René Scharfe
2011-08-07 20:02 ` Johannes Sixt
2011-08-07 21:06 ` Jeff King
2011-08-08 17:10 ` René Scharfe
2011-08-09 5:02 ` Jeff King
2011-08-09 10:25 ` René Scharfe
2011-08-09 20:05 ` Jeff King
2011-09-29 19:54 ` Erik Faye-Lund
2011-09-29 20:18 ` René Scharfe
2011-09-29 20:20 ` Erik Faye-Lund
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=4E3829DC.8070802@lsrfire.ath.cx \
--to=rene.scharfe@lsrfire.ath.cx \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
--cc=kusmabite@gmail.com \
--cc=peff@peff.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 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).