t6020: Add a testcase for modify/delete + directory/file conflict

diff --git a/diff-lib.c b/diff-lib.c
index c9f6e05badf7b752188dcb5fa28a9bef53521dee..392ce2bef05746cea7922d39da67bf25d1d3d192 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -68,10 +68,16 @@ static int match_stat_with_submodule(struct diff_options *diffopt,
                                      unsigned ce_option, unsigned *dirty_submodule)
 {
        int changed = ce_match_stat(ce, st, ce_option);
-       if (S_ISGITLINK(ce->ce_mode)
-           && !DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES)
-           && (!changed || DIFF_OPT_TST(diffopt, DIRTY_SUBMODULES))) {
-               *dirty_submodule = is_submodule_modified(ce->name, DIFF_OPT_TST(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES));
+       if (S_ISGITLINK(ce->ce_mode)) {
+               unsigned orig_flags = diffopt->flags;
+               if (!DIFF_OPT_TST(diffopt, OVERRIDE_SUBMODULE_CONFIG))
+                       set_diffopt_flags_from_submodule_config(diffopt, ce->name);
+               if (DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES))
+                       changed = 0;
+               else if (!DIFF_OPT_TST(diffopt, IGNORE_DIRTY_SUBMODULES)
+                   && (!changed || DIFF_OPT_TST(diffopt, DIRTY_SUBMODULES)))
+                       *dirty_submodule = is_submodule_modified(ce->name, DIFF_OPT_TST(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES));
+               diffopt->flags = orig_flags;
        }
        return changed;
 }