undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/calloc-pathspec'

Browse Source 
* jc/calloc-pathspec:
  ps_matched: xcalloc() takes nmemb and then element size
This commit is contained in:
Junio C Hamano 2015-08-26 15:45:33 -07:00
commit 88bd19be2f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/checkout.c
View File

@ -280,7 +280,7 @@ static int checkout_paths(const struct checkout_opts *opts,
if (opts->source_tree) if (opts->source_tree)
read_tree_some(opts->source_tree, &opts->pathspec); read_tree_some(opts->source_tree, &opts->pathspec);
ps_matched = xcalloc(1, opts->pathspec.nr); ps_matched = xcalloc(opts->pathspec.nr, 1);
/* /*
* Make sure all pathspecs participated in locating the paths * Make sure all pathspecs participated in locating the paths

2
builtin/ls-files.c
View File

@ -516,7 +516,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
/* Treat unmatching pathspec elements as errors */ /* Treat unmatching pathspec elements as errors */
if (pathspec.nr && error_unmatch) 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) if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
die("ls-files --ignored needs some exclude pattern"); die("ls-files --ignored needs some exclude pattern");