summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-13 21:39:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-13 21:39:13 (GMT)
commite75c862125f219c983cd2980d1b33ec09a3c34b9 (patch)
tree716c9f3eec268b391e30360abf39ee7700dd40a4 /revision.c
parent73df1b34218b1bce579a3ed90166db9df43d9e67 (diff)
parentae59a4e44f359f74d0fede109c29bb53f726209b (diff)
downloadgit-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 'revision.c')
-rw-r--r--revision.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index 236d0d5..5ce9b93 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);
}