diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-13 21:39:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-13 21:39:13 (GMT) |
| commit | e75c862125f219c983cd2980d1b33ec09a3c34b9 (patch) | |
| tree | 716c9f3eec268b391e30360abf39ee7700dd40a4 /cache-tree.c | |
| parent | 73df1b34218b1bce579a3ed90166db9df43d9e67 (diff) | |
| parent | ae59a4e44f359f74d0fede109c29bb53f726209b (diff) | |
| download | git-e75c862125f219c983cd2980d1b33ec09a3c34b9.zip git-e75c862125f219c983cd2980d1b33ec09a3c34b9.tar.gz git-e75c862125f219c983cd2980d1b33ec09a3c34b9.tar.bz2 | |
Merge branch 'tg/split-index-fixes'
The split-index mode had a few corner case bugs fixed.
* tg/split-index-fixes:
travis: run tests with GIT_TEST_SPLIT_INDEX
split-index: don't write cache tree with null oid entries
read-cache: fix reading the shared index for other repos
Diffstat (limited to 'cache-tree.c')
| -rw-r--r-- | cache-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cache-tree.c b/cache-tree.c index e03e72c..0dd6292 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -608,7 +608,7 @@ int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, co hold_lock_file_for_update(&lock_file, index_path, LOCK_DIE_ON_ERROR); - entries = read_index_from(index_state, index_path); + entries = read_index_from(index_state, index_path, get_git_dir()); if (entries < 0) { ret = WRITE_TREE_UNREADABLE_INDEX; goto out; |