Merge branch 'ls/convert-filter-progress' into next

diff --git a/diff.c b/diff.c
index 36c5f7fa5009826db23b6b5a9d2875ba3979188a..3d3e553a98bc4fd83d2f79515056c4116086b5df 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -402,9 +402,6 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
                return 0;
        }
 
-       if (starts_with(var, "submodule."))
-               return parse_submodule_config_option(var, value);
-
        if (git_diff_heuristic_config(var, value, cb) < 0)
                return -1;