mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/report-path-error-to-dir' into maint

Browse Source 
Code clean-up.

* jc/report-path-error-to-dir:
  report_path_error(): move to dir.c
This commit is contained in:
Junio C Hamano
2015-03-31 14:53:08 -07:00
parent a78fc4af82 777c55a616
commit ab0fb57aac
4 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
builtin/ls-files.c
View File

@ -354,49 +354,6 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix)
}
}
int report_path_error(const char *ps_matched,
const struct pathspec *pathspec,
const char *prefix)
{
/*
* Make sure all pathspec matched; otherwise it is an error.
*/
struct strbuf sb = STRBUF_INIT;
int num, errors = 0;
for (num = 0; num < pathspec->nr; num++) {
int other, found_dup;
if (ps_matched[num])
continue;
/*
* The caller might have fed identical pathspec
* twice. Do not barf on such a mistake.
* FIXME: parse_pathspec should have eliminated
* duplicate pathspec.
*/
for (found_dup = other = 0;
!found_dup && other < pathspec->nr;
other++) {
if (other == num || !ps_matched[other])
continue;
if (!strcmp(pathspec->items[other].original,
pathspec->items[num].original))
/*
* Ok, we have a match already.
*/
found_dup = 1;
}
if (found_dup)
continue;
error("pathspec '%s' did not match any file(s) known to git.",
pathspec->items[num].original);
errors++;
}
strbuf_release(&sb);
return errors;
}
static const char * const ls_files_usage[] = {
N_("git ls-files [options] [<file>...]"),
NULL