Merge branch 'jt/non-blob-lazy-fetch' into maint

diff --git a/builtin/checkout.c b/builtin/checkout.c
index cb6bb76312a00cbcf997ef44e43128964777e86e..29ef50013dccbd118093af0b4dc08eb907953cc2 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -318,7 +318,7 @@ static int checkout_paths(const struct checkout_opts *opts,
                 * match_pathspec() for _all_ entries when
                 * opts->source_tree != NULL.
                 */
-               if (ce_path_match(ce, &opts->pathspec, ps_matched))
+               if (ce_path_match(&the_index, ce, &opts->pathspec, ps_matched))
                        ce->ce_flags |= CE_MATCHED;
        }