Merge branch 'lm/range-diff-submodule-fix'

diff --git a/builtin/reset.c b/builtin/reset.c
index 11cd0dcb8cc73ac753b7ed746e194ba1458742ee..6d37a35e2e583c4508b7e506e5307699ff166fb5 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -159,6 +159,7 @@ static int read_from_tree(const struct pathspec *pathspec,
        opt.format_callback = update_index_from_diff;
        opt.format_callback_data = &intent_to_add;
        opt.flags.override_submodule_config = 1;
+       opt.repo = the_repository;
 
        if (do_diff_cache(tree_oid, &opt))
                return 1;