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

Code clean-up.

* jc/report-path-error-to-dir:
  report_path_error(): move to dir.c

diff --cc builtin/ls-files.c
index 914054d,47d70b2..6fa2205
--- 1/builtin/ls-files.c
--- 2/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@@ -354,51 -354,8 +354,8 @@@ void overlay_tree_on_cache(const char *
        }
  }
  
- 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>...]"),
 +      N_("git ls-files [<options>] [<file>...]"),
        NULL
  };
  

diff --cc cache.h
Simple merge

diff --cc dir.c
Simple merge

diff --cc dir.h
Simple merge