From 3a95f31d1cdc93fa4f926c6537f84186edd85ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?= Date: Sat, 12 Jan 2019 09:13:24 +0700 Subject: repository.c: replace hold_locked_index() with repo_hold_locked_index() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Junio C Hamano --- repository.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'repository.h') diff --git a/repository.h b/repository.h index 9f16c42c1e..968330218f 100644 --- a/repository.h +++ b/repository.h @@ -6,6 +6,7 @@ struct config_set; struct git_hash_algo; struct index_state; +struct lock_file; struct raw_object_store; struct submodule_cache; @@ -130,5 +131,8 @@ void repo_clear(struct repository *repo); * populated then the number of entries will simply be returned. */ int repo_read_index(struct repository *repo); +int repo_hold_locked_index(struct repository *repo, + struct lock_file *lf, + int flags); #endif /* REPOSITORY_H */ -- cgit v1.2.3