diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-23 00:24:10 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-23 00:24:10 +0300 |
| commit | b0e0fc267bfb270b0ccf48ff17179c9c315dc2a9 (patch) | |
| tree | b2fe4a33f8ecaf45c88b837551d8f57b2d1d72ec /cache-tree.c | |
| parent | 7e44d8055c76d4e8291d6dae289ebccab1e72aab (diff) | |
| parent | ae59a4e44f359f74d0fede109c29bb53f726209b (diff) | |
Merge branch 'tg/split-index-fixes' into maint
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 e03e72c34a..0dd6292a94 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; |