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
This commit is contained in:
@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user