Merge branch 'tg/split-index-fixes'

diff --git a/revision.c b/revision.c
index 236d0d579f0b6920127e586fe09391d172445318..5ce9b93baa72685893dd30b62c067bff1f18d636 100644 (file)
--- 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);
        }