@matheusbsbs / matheus-bagliano / commits / c6d8ccf3a2

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>

Brandon Williams committed Nov 6, 2017 at 14:08 UTC c6d8ccf3a25556e1cac99433721e3c05ba970d89
2 files changed +20 -1
t/t3426-rebase-submodule.sh
+17
@@ -40,4 +40,21 @@ git_rebase_interactive () {
40
41 test_submodule_switch "git_rebase_interactive"
42
43 +test_expect_success 'rebase interactive ignores modified submodules' '
44 + test_when_finished "rm -rf super sub" &&
45 + git init sub &&
46 + git -C sub commit --allow-empty -m "Initial commit" &&
47 + git init super &&
48 + git -C super submodule add ../sub &&
49 + git -C super config submodule.sub.ignore dirty &&
50 + >super/foo &&
51 + git -C super add foo &&
52 + git -C super commit -m "Initial commit" &&
53 + test_commit -C super a &&
54 + test_commit -C super b &&
55 + test_commit -C super/sub c &&
56 + set_fake_editor &&
57 + git -C super rebase -i HEAD^^
58 +'
59 +
60 test_done
wt-status.c
+3 -1
@@ -2262,8 +2262,10 @@ int has_unstaged_changes(int ignore_submodules)
2262 int result;
2263
2264 init_revisions(&rev_info, NULL);
2265 - if (ignore_submodules)
2265 + if (ignore_submodules) {
2266 DIFF_OPT_SET(&rev_info.diffopt, IGNORE_SUBMODULES);
2267 + DIFF_OPT_SET(&rev_info.diffopt, OVERRIDE_SUBMODULE_CONFIG);
2268 + }
2269 DIFF_OPT_SET(&rev_info.diffopt, QUICK);
2270 diff_setup_done(&rev_info.diffopt);
2271 result = run_diff_files(&rev_info, 0);