diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-13 22:39:12 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-13 22:39:13 +0100 |
| commit | e75c862125f219c983cd2980d1b33ec09a3c34b9 (patch) | |
| tree | 716c9f3eec268b391e30360abf39ee7700dd40a4 /repository.c | |
| parent | Merge branch 'rs/strbuf-cocci-workaround' (diff) | |
| parent | travis: run tests with GIT_TEST_SPLIT_INDEX (diff) | |
| download | git-e75c862125f219c983cd2980d1b33ec09a3c34b9.tar.xz git-e75c862125f219c983cd2980d1b33ec09a3c34b9.zip | |
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 'repository.c')
| -rw-r--r-- | repository.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/repository.c b/repository.c index f66fcb1342..4ffbe9bc94 100644 --- a/repository.c +++ b/repository.c @@ -236,5 +236,5 @@ int repo_read_index(struct repository *repo) if (!repo->index) repo->index = xcalloc(1, sizeof(*repo->index)); - return read_index_from(repo->index, repo->index_file); + return read_index_from(repo->index, repo->index_file, repo->gitdir); } |