summaryrefslogtreecommitdiff
path: root/Documentation/RelNotes/1.8.0.1.txt
diff options
context:
space:
mode:
authorLibravatar Brandon Williams <bmwill@google.com>2017-11-06 14:08:19 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-07 11:20:55 +0900
commitc6d8ccf3a25556e1cac99433721e3c05ba970d89 (patch)
tree7d80aafc1fc9729e63c1bad8d91ab4eae79effec /Documentation/RelNotes/1.8.0.1.txt
parentsubmodule: remove gitmodules_config (diff)
downloadtgif-c6d8ccf3a25556e1cac99433721e3c05ba970d89.tar.xz
wt-status: actually ignore submodules when requested
Since ff6f1f564 (submodule-config: lazy-load a repository's .gitmodules file, 2017-08-03) rebase interactive fails if there are any submodules with unstaged changes which have been configured with a value for 'submodule.<name>.ignore' in the repository's config. This is due to how configured values of 'submodule.<name>.ignore' are handled in addition to a change in how the submodule config is loaded. When the diff machinery hits a submodule (gitlink as well as a corresponding entry in the submodule subsystem) it will read the value of 'submodule.<name>.ignore' stored in the repository's config and if the config is present it will clear the 'IGNORE_SUBMODULES' (which is the flag explicitly requested by rebase interactive), 'IGNORE_UNTRACKED_IN_SUBMODULES', and 'IGNORE_DIRTY_SUBMODULES' diff flags and then set one of them based on the configured value. Historically this wasn't a problem because the submodule subsystem wasn't initialized because the .gitmodules file wasn't explicitly loaded by the rebase interactive command. So when the diff machinery hit a submodule it would skip over reading any configured values of 'submodule.<name>.ignore'. In order to preserve the behavior of submodules being ignored by rebase interactive, also set the 'OVERRIDE_SUBMODULE_CONFIG' diff flag when submodules are requested to be ignored when checking for unstaged changes. Reported-by: Orgad Shaneh <orgads@gmail.com> Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/1.8.0.1.txt')
0 files changed, 0 insertions, 0 deletions