From: Toon Claes <toon@iotcl•com>
To: Junio C Hamano <gitster@pobox•com>, git@vger•kernel.org
Cc: Justin Tobler <jltobler@gmail•com>
Subject: Re: What's cooking in git.git (Aug 2025, #02; Mon, 4)
Date: Tue, 05 Aug 2025 15:55:25 +0200 [thread overview]
Message-ID: <87y0rxub3m.fsf@iotcl.com> (raw)
In-Reply-To: <xmqqectr57ax.fsf@gitster.g>
Junio C Hamano <gitster@pobox•com> writes:
> * jt/archive-zip-deflate-fix (2025-08-02) 1 commit
> (merged to 'next' on 2025-08-04 at 4444b611dc)
> + archive: flush deflate stream until Z_STREAM_END
>
> The deflate codepath in "git archive --format=zip" had a
> longstanding bug coming from misuse of zlib API, which has been
> corrected.
>
> Will merge to 'master'.
> source: <20250802220803.95137-1-jltobler@gmail•com>
I see this was merged into 'next' with 4444b611dc (Merge branch
'jt/archive-zip-deflate-fix' into next, 2025-08-04), but was reverted
again in 5297b08916 (Revert "Merge branch 'jt/archive-zip-deflate-fix'
into next", 2025-08-04)
The fix in this patch definitely was the correct way forward, and it
fixed the issue at hand. So I don't think it should have been reverted.
I've sent a review and some patches in response, suggesting for an
alternative fix. I'm not claiming my fix is better, and it might
introduce other bug. I don't even know if the changes are even required.
To dive into the details: The output buffer for the compressed data is
twice the size of the input buffer. There is no reason to believe this
would cause any issues.
So currently I'm more in line with Justin, and I agree with the
pragmatic approach to only fix the issue we know is an issue, while we
keep the number of changed lines minimal.
Sorry for the confusion and for bringing in a concurrent series of
patches. Please ignore those and continue with this patch from Justin.
--
Cheers,
Toon
next prev parent reply other threads:[~2025-08-05 13:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-04 17:24 What's cooking in git.git (Aug 2025, #02; Mon, 4) Junio C Hamano
2025-08-05 13:55 ` Toon Claes [this message]
2025-08-05 18:03 ` Junio C Hamano
2025-08-06 20:47 ` SZEDER Gábor
2025-08-06 21:18 ` Junio C Hamano
2025-08-07 4:43 ` Patrick Steinhardt
2025-08-07 15:22 ` Junio C Hamano
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=87y0rxub3m.fsf@iotcl.com \
--to=toon@iotcl$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jltobler@gmail$(echo .)com \
/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