Merge branch 'tg/split-index-fixes' into maint

[git/git.git] / revision.c

diff --git a/revision.c b/revision.c
index 1f7454c..a2ba544 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1352,7 +1352,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,
                        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);
        }
                        do_add_index_objects_to_pending(revs, &istate);
                discard_index(&istate);
        }