Re: What's cooking in git.git (Aug 2025, #02; Mon, 4)

From: Junio C Hamano <gitster@pobox.com>
Date: Aug 5, 2025, 18:03 UTC
Message-ID: <xmqqms8dzlvk.fsf@gitster.g>
In-Reply-To: <87y0rxub3m.fsf@iotcl.com>

Toon Claes <toon@iotcl.com> writes:

Show 24 quoted lines

> 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.

The intention on my part was that the merge was premature before other people expressed their thoughts. Perhaps the list may decide that "we must loop around git_deflate() until we see STREAM_END" is sufficient, in which case I'll merge it back again.

Thanks.