Merge branch 'js/difftool-no-index'

diff --git a/builtin/checkout.c b/builtin/checkout.c
index f95e7975f7e970cf205c9e97c25296324477f249..2e72a5e5a944e99ef7e3e44cdcb2e8b2feb22a90 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -376,7 +376,7 @@ static int checkout_paths(const struct checkout_opts *opts,
                                                        ps_matched,
                                                        opts);
 
-       if (report_path_error(ps_matched, &opts->pathspec, opts->prefix)) {
+       if (report_path_error(ps_matched, &opts->pathspec)) {
                free(ps_matched);
                return 1;
        }