Skip to content

Drop obsolete downstream patches#6208

Open
dscho wants to merge 2 commits intomainfrom
drop-obsolete-patches
Open

Drop obsolete downstream patches#6208
dscho wants to merge 2 commits intomainfrom
drop-obsolete-patches

Conversation

@dscho
Copy link
Copy Markdown
Member

@dscho dscho commented Apr 26, 2026

Over time, as upstream Git absorbs fixes and features that originated in or were carried by Git for Windows, downstream patches accumulate that are no longer needed. The steady stream of merged PRs makes this virtually inevitable. This PR collects fixup! commits to drop three such patches during the next autosquash rebase.

The HTTP/2 workaround in t5551 was a temporary fix for a libcurl v8.10.0 regression on macOS CI runners. The faulty libcurl has long been superseded by fixed versions, making it unnecessary.

The unix-socket: avoid leak when initialization fails patch changed return -1 to goto fail in unix_stream_connect() so cleanup would run when unix_sockaddr_init() failed. Upstream fixed the same leak more surgically in c5fe29f (unix-socket: fix memory leak when chdir(3p) fails, 2025-01-30) by having unix_sockaddr_init() call FREE_AND_NULL(ctx->orig_dir) before returning, making the downstream caller-side fix redundant.

The revision: create mark_trees_uninteresting_dense() commit was a preparatory patch for the path-walk API. That API has since been upstreamed, and this commit became empty during the merging-rebase because its changes were already in the new base.

This was marked as a temporary work-around in 4538ee6 (ci: work
around a problem with HTTP/2 vs libcurl v8.10.0 (#5165), 2024-09-24), to
help CI builds pass even on macOS. The faulty libcurl version has hence
been replaced with plenty of fixed ones, therefore this work-around is
no longer necessary.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho self-assigned this Apr 27, 2026
@dscho dscho requested review from mjcheetham and rimrul April 27, 2026 07:36
Comment thread unix-socket.c Outdated

if (unix_sockaddr_init(&sa, path, &ctx, disallow_chdir) < 0)
goto fail;
return -1;
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops. I think I need to retract this. c5fe29f is not at all about the same leak, it addresses a completely different leak!

This was a preparatory commit for the path-walk API, which has since
been upstreamed into v2.54.0. During the merging-rebase, the code
changes this commit introduced were already present in the new base,
leaving it empty. Drop it.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho force-pushed the drop-obsolete-patches branch from be129aa to c340e33 Compare April 27, 2026 07:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants