From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Feb 2024 02:10:24 +0000 (-0800)
Subject: Merge branch 'cp/apply-core-filemode'
X-Git-Tag: v2.45.0-rc0~175
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf47fb7ec7e183a1a1e521a540862fba3c2a89eb;p=thirdparty%2Fgit.git

Merge branch 'cp/apply-core-filemode'

"git apply" on a filesystem without filemode support have learned
to take a hint from what is in the index for the path, even when
not working with the "--index" or "--cached" option, when checking
the executable bit match what is required by the preimage in the
patch.

* cp/apply-core-filemode:
  apply: code simplification
  apply: correctly reverse patch's pre- and post-image mode bits
  apply: ignore working tree filemode when !core.filemode
---

cf47fb7ec7e183a1a1e521a540862fba3c2a89eb