diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-12 03:13:24 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 21:13:04 +0100 |
| commit | 3a95f31d1cdc93fa4f926c6537f84186edd85ca9 (patch) | |
| tree | 102d6623808b54f676dcbde75b1ed28705358f60 /wt-status.c | |
| parent | notes-utils.c: remove the_repository references (diff) | |
| download | git-3a95f31d1cdc93fa4f926c6537f84186edd85ca9.tar.xz git-3a95f31d1cdc93fa4f926c6537f84186edd85ca9.zip | |
repository.c: replace hold_locked_index() with repo_hold_locked_index()
hold_locked_index() assumes the index path at $GIT_DIR/index. This is
not good for places that take an arbitrary index_state instead of
the_index, which is basically everywhere except builtin/.
Replace it with repo_hold_locked_index(). hold_locked_index() remains
as a wrapper around repo_hold_locked_index() to reduce changes in builtin/
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 'wt-status.c')
| -rw-r--r-- | wt-status.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c index 0fe3bcd4cd..becf78b04f 100644 --- a/wt-status.c +++ b/wt-status.c @@ -2375,7 +2375,7 @@ 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); |