Merge branch 'sb/submodule-update-reset-fix' into maint

diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index 31d2cb410738d335d9f6431d6901ea1c0f8b67ff..b775a756470ddc365907fae53dcc949bcaae7ca5 100644 (file)
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -110,7 +110,8 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
 
        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
        init_revisions(opt, prefix);
-       gitmodules_config();
+       if (read_cache() < 0)
+               die(_("index file corrupt"));
        opt->abbrev = 0;
        opt->diff = 1;
        opt->disable_stdin = 1;