diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2019-01-12 02:13:24 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-14 20:13:04 (GMT) |
| commit | 3a95f31d1cdc93fa4f926c6537f84186edd85ca9 (patch) | |
| tree | 102d6623808b54f676dcbde75b1ed28705358f60 /merge-recursive.c | |
| parent | 1d18d7581cf1ce45314b7ed58e52d5cc73b2e7a7 (diff) | |
| download | git-3a95f31d1cdc93fa4f926c6537f84186edd85ca9.zip git-3a95f31d1cdc93fa4f926c6537f84186edd85ca9.tar.gz git-3a95f31d1cdc93fa4f926c6537f84186edd85ca9.tar.bz2 | |
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 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index ecf8db0..8dba939 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -3643,7 +3643,7 @@ int merge_recursive_generic(struct merge_options *o, } } - hold_locked_index(&lock, LOCK_DIE_ON_ERROR); + repo_hold_locked_index(the_repository, &lock, LOCK_DIE_ON_ERROR); clean = merge_recursive(o, head_commit, next_commit, ca, result); if (clean < 0) { |