summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-01-04 21:33:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-04 21:33:33 (GMT)
commitcde555480b95c4311819dc1f7a38cc856a9aed23 (patch)
treeafa74222656ad1c41fd10e48a7c8d40f484b87b2 /builtin/reset.c
parent3b2f8a02fa9a9e68d5215828e1d97bb4f6996976 (diff)
parent36e7ed69de2c07a0214e79bde45714b92ac30ff2 (diff)
downloadgit-cde555480b95c4311819dc1f7a38cc856a9aed23.zip
git-cde555480b95c4311819dc1f7a38cc856a9aed23.tar.gz
git-cde555480b95c4311819dc1f7a38cc856a9aed23.tar.bz2
Merge branch 'nd/the-index'
More codepaths become aware of working with in-core repository instance other than the default "the_repository". * nd/the-index: (22 commits) rebase-interactive.c: remove the_repository references rerere.c: remove the_repository references pack-*.c: remove the_repository references pack-check.c: remove the_repository references notes-cache.c: remove the_repository references line-log.c: remove the_repository reference diff-lib.c: remove the_repository references delta-islands.c: remove the_repository references cache-tree.c: remove the_repository references bundle.c: remove the_repository references branch.c: remove the_repository reference bisect.c: remove the_repository reference blame.c: remove implicit dependency the_repository sequencer.c: remove implicit dependency on the_repository sequencer.c: remove implicit dependency on the_index transport.c: remove implicit dependency on the_index notes-merge.c: remove implicit dependency the_repository notes-merge.c: remove implicit dependency on the_index list-objects.c: reduce the_repository references list-objects-filter.c: remove implicit dependency on the_index ...
Diffstat (limited to 'builtin/reset.c')
-rw-r--r--builtin/reset.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/reset.c b/builtin/reset.c
index 5816696..59898c9 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -95,7 +95,7 @@ static int reset_index(const struct object_id *oid, int reset_type, int quiet)
if (reset_type == MIXED || reset_type == HARD) {
tree = parse_tree_indirect(oid);
- prime_cache_tree(&the_index, tree);
+ prime_cache_tree(the_repository, the_repository->index, tree);
}
ret = 0;
@@ -413,7 +413,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
print_new_head_line(lookup_commit_reference(the_repository, &oid));
}
if (!pathspec.nr)
- remove_branch_state();
+ remove_branch_state(the_repository);
return update_ref_status;
}