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 /revision.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 'revision.c')
| -rw-r--r-- | revision.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/revision.c b/revision.c index 236d0d579f..5ce9b93baa 100644 --- a/revision.c +++ b/revision.c @@ -1362,7 +1362,8 @@ void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags) continue; /* current index already taken care of */ if (read_index_from(&istate, - worktree_git_path(wt, "index")) > 0) + worktree_git_path(wt, "index"), + get_worktree_git_dir(wt)) > 0) do_add_index_objects_to_pending(revs, &istate); discard_index(&istate); } |