Merge branch 'dt/http-range'

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 19063ebc64af2378d69b31933367a0d01d8a2630..b6a7cb0c7c48293c6348806cb342a9289f146740 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -355,7 +355,7 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix)
 }
 
 static const char * const ls_files_usage[] = {
-       N_("git ls-files [options] [<file>...]"),
+       N_("git ls-files [<options>] [<file>...]"),
        NULL
 };
 
@@ -516,7 +516,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 
        /* Treat unmatching pathspec elements as errors */
        if (pathspec.nr && error_unmatch)
-               ps_matched = xcalloc(1, pathspec.nr);
+               ps_matched = xcalloc(pathspec.nr, 1);
 
        if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
                die("ls-files --ignored needs some exclude pattern");