diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:22 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-07 06:05:23 (GMT) |
commit | 7589e63648bf5224e186990931b1491f36e10a4b (patch) | |
tree | dfd3004e735b69ae91dc08ac4f742f1cb84eae5d /wt-status.c | |
parent | e52c6bbd131f1f4f17b95e28d12ead0c81a8e890 (diff) | |
parent | f8adbec9feaa7a1ab9814db1115826e87033712e (diff) | |
download | git-7589e63648bf5224e186990931b1491f36e10a4b.zip git-7589e63648bf5224e186990931b1491f36e10a4b.tar.gz git-7589e63648bf5224e186990931b1491f36e10a4b.tar.bz2 |
Merge branch 'nd/the-index-final'
The assumption to work on the single "in-core index" instance has
been reduced from the library-ish part of the codebase.
* nd/the-index-final:
cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch
read-cache.c: remove the_* from index_has_changes()
merge-recursive.c: remove implicit dependency on the_repository
merge-recursive.c: remove implicit dependency on the_index
sha1-name.c: remove implicit dependency on the_index
read-cache.c: replace update_index_if_able with repo_&
read-cache.c: kill read_index()
checkout: avoid the_index when possible
repository.c: replace hold_locked_index() with repo_hold_locked_index()
notes-utils.c: remove the_repository references
grep: use grep_opt->repo instead of explict repo argument
Diffstat (limited to 'wt-status.c')
-rw-r--r-- | wt-status.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wt-status.c b/wt-status.c index 0fe3bcd..1f564b1 100644 --- a/wt-status.c +++ b/wt-status.c @@ -2375,10 +2375,10 @@ int require_clean_work_tree(struct repository *r, struct lock_file lock_file = LOCK_INIT; int err = 0, fd; - fd = hold_locked_index(&lock_file, 0); + fd = repo_hold_locked_index(r, &lock_file, 0); refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL); if (0 <= fd) - update_index_if_able(r->index, &lock_file); + repo_update_index_if_able(r, &lock_file); rollback_lock_file(&lock_file); if (has_unstaged_changes(r, ignore_submodules)) { |