From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Jun 2023 18:21:17 +0000 (-0700)
Subject: Merge branch 'js/defeat-ignore-submodules-config-with-explicit-addition'
X-Git-Tag: v2.42.0-rc0~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ee088deb83e2a4a78ac3882168b3e8fadd4f541;p=thirdparty%2Fgit.git

Merge branch 'js/defeat-ignore-submodules-config-with-explicit-addition'

Even when diff.ignoreSubmodules tells us to ignore submodule
changes, "git commit" with an index that already records changes to
submodules should include the submodule changes in the resulting
commit, but it did not.

* js/defeat-ignore-submodules-config-with-explicit-addition:
  diff-lib: honor override_submodule_config flag bit
---

4ee088deb83e2a4a78ac3882168b3e8fadd4f541