As people have seen, the latest "security fix" release turned out to
be a mixed bag of good vulnerability fixes with a bit over-eager
"layered defence" that broke real uses cases like git-lfs. Let's
quickly get them in working order back first, with the vision that
we will then rebuild layered defence more carefully in the open on
top as necessary.
What we have here are the first "revert" part.
These patches are designed to apply to 2.39.4; the series may have
to grow as we discover more things to revert, but for now here are
the patches to
- revert the over-eager "refusal to work" went into 2.39.4
- adjust 2.39.4 codebase to cleanly build and test (at CI and
locally) by backported fixes
It would have been better if we did not have to have the latter
class, but such is life.
I'll figure out a way to convey conflict resolutions as this topic
gets merged up to newer maintenance tracks on the list so that
people can assist with ensuring correctness of the result by
reviewing, and follow up. ("git show --remerge-diff" might turn out
to be such a way, but I do not know yet).
Jeff King (5):
send-email: drop FakeTerm hack
send-email: avoid creating more than one Term::ReadLine object
ci: drop mention of BREW_INSTALL_PACKAGES variable
ci: avoid bare "gcc" for osx-gcc job
ci: stop installing "gcc-13" for osx-gcc
Johannes Schindelin (6):
hook: plug a new memory leak
init: use the correct path of the templates directory again
Revert "core.hooksPath: add some protection while cloning"
tests: verify that `clone -c core.hooksPath=/dev/null` works again
clone: drop the protections where hooks aren't run
Revert "Add a helper function to compare file contents"
Junio C Hamano (1):
Revert "fetch/clone: detect dubious ownership of local repositories"
.github/workflows/main.yml | 3 +-
Makefile | 2 +-
builtin/clone.c | 12 +-------
cache.h | 14 ---------
ci/install-dependencies.sh | 2 --
config.c | 13 +-------
copy.c | 58 -----------------------------------
git-send-email.perl | 32 +++++++------------
hook.c | 32 -------------------
path.c | 2 --
t/helper/test-path-utils.c | 10 ------
t/t0060-path-utils.sh | 41 -------------------------
t/t0411-clone-from-partial.sh | 6 ++--
t/t1350-config-hooks-path.sh | 7 +++++
t/t1800-hook.sh | 15 ---------
t/t5601-clone.sh | 51 ------------------------------
t/t9001-send-email.sh | 5 +--
17 files changed, 28 insertions(+), 277 deletions(-)
--
2.45.1-216-g4365c6fcf9
