summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-09-21 15:57:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-21 16:48:10 (GMT)
commitb78ea5fc3574a2ce262cfb37a7ea890caddd0cf5 (patch)
treefa241215b447ccd61db65f6a44356b7f93344854 /builtin/reset.c
parent92a1bf5a58920e5f1f51106f06cd9dc6d6eb6c43 (diff)
downloadgit-b78ea5fc3574a2ce262cfb37a7ea890caddd0cf5.zip
git-b78ea5fc3574a2ce262cfb37a7ea890caddd0cf5.tar.gz
git-b78ea5fc3574a2ce262cfb37a7ea890caddd0cf5.tar.bz2
diff.c: reduce implicit dependency on the_index
diff and textconv code has so widespread use that it's hard to simply update their api and all call sites at once because it would result in a big patch. For now reduce the_index references to two places: diff_setup() and fill_textconv(). Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/reset.c')
-rw-r--r--builtin/reset.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/reset.c b/builtin/reset.c
index 11cd0dc..6d37a35 100644
--- 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;