Merge branch 'jh/trace2-pretty-output'

diff --git a/dir.h b/dir.h
index 4c227cc3dc6235c3ce7ffa980e0fd16431d1f91c..680079bbe3241ff84fc8260009515f03b6ba819e 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -217,23 +217,23 @@ int simple_length(const char *match);
 int no_wildcard(const char *string);
 char *common_prefix(const struct pathspec *pathspec);
 int match_pathspec(const struct index_state *istate,
-                         const struct pathspec *pathspec,
-                         const char *name, int namelen,
-                         int prefix, char *seen, int is_dir);
-int report_path_error(const char *ps_matched, const struct pathspec *pathspec, const char *prefix);
+                  const struct pathspec *pathspec,
+                  const char *name, int namelen,
+                  int prefix, char *seen, int is_dir);
+int report_path_error(const char *ps_matched, const struct pathspec *pathspec);
 int within_depth(const char *name, int namelen, int depth, int max_depth);
 
 int fill_directory(struct dir_struct *dir,
-                         struct index_state *istate,
-                         const struct pathspec *pathspec);
+                  struct index_state *istate,
+                  const struct pathspec *pathspec);
 int read_directory(struct dir_struct *, struct index_state *istate,
-                         const char *path, int len,
-                         const struct pathspec *pathspec);
+                  const char *path, int len,
+                  const struct pathspec *pathspec);
 
 int is_excluded_from_list(const char *pathname, int pathlen,
-                                const char *basename, int *dtype,
-                                struct exclude_list *el,
-                                struct index_state *istate);
+                         const char *basename, int *dtype,
+                         struct exclude_list *el,
+                         struct index_state *istate);
 struct dir_entry *dir_add_ignored(struct dir_struct *dir,
                                  struct index_state *istate,
                                  const char *pathname, int len);
@@ -243,32 +243,34 @@ struct dir_entry *dir_add_ignored(struct dir_struct *dir,
  * attr.c:path_matches()
  */
 int match_basename(const char *, int,
-                         const char *, int, int, unsigned);
+                  const char *, int, int, unsigned);
 int match_pathname(const char *, int,
-                         const char *, int,
-                         const char *, int, int, unsigned);
+                  const char *, int,
+                  const char *, int, int, unsigned);
 
 struct exclude *last_exclude_matching(struct dir_struct *dir,
-                                            struct index_state *istate,
-                                            const char *name, int *dtype);
+                                     struct index_state *istate,
+                                     const char *name, int *dtype);
 
 int is_excluded(struct dir_struct *dir,
-                      struct index_state *istate,
-                      const char *name, int *dtype);
+               struct index_state *istate,
+               const char *name, int *dtype);
 
 struct exclude_list *add_exclude_list(struct dir_struct *dir,
-                                            int group_type, const char *src);
+                                     int group_type, const char *src);
 int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen,
-                                         struct exclude_list *el, struct  index_state *istate);
+                                  struct exclude_list *el, struct  index_state *istate);
 void add_excludes_from_file(struct dir_struct *, const char *fname);
 int add_excludes_from_blob_to_list(struct object_id *oid,
-                                         const char *base, int baselen,
-                                         struct exclude_list *el);
+                                  const char *base, int baselen,
+                                  struct exclude_list *el);
 void parse_exclude_pattern(const char **string, int *patternlen, unsigned *flags, int *nowildcardlen);
 void add_exclude(const char *string, const char *base,
-                       int baselen, struct exclude_list *el, int srcpos);
+                int baselen, struct exclude_list *el, int srcpos);
 void clear_exclude_list(struct exclude_list *el);
 void clear_directory(struct dir_struct *dir);
+
+int repo_file_exists(struct repository *repo, const char *path);
 int file_exists(const char *);
 
 int is_inside_dir(const char *dir);
@@ -324,13 +326,13 @@ int fspathncmp(const char *a, const char *b, size_t count);
  */
 struct pathspec_item;
 int git_fnmatch(const struct pathspec_item *item,
-                      const char *pattern, const char *string,
-                      int prefix);
+               const char *pattern, const char *string,
+               int prefix);
 
 int submodule_path_match(const struct index_state *istate,
-                               const struct pathspec *ps,
-                               const char *submodule_name,
-                               char *seen);
+                        const struct pathspec *ps,
+                        const char *submodule_name,
+                        char *seen);
 
 static inline int ce_path_match(const struct index_state *istate,
                                const struct cache_entry *ce,
@@ -373,9 +375,9 @@ void remove_untracked_cache(struct index_state *istate);
  * connecting them as well.
  */
 void connect_work_tree_and_git_dir(const char *work_tree,
-                                         const char *git_dir,
-                                         int recurse_into_nested);
+                                  const char *git_dir,
+                                  int recurse_into_nested);
 void relocate_gitdir(const char *path,
-                           const char *old_git_dir,
-                           const char *new_git_dir);
+                    const char *old_git_dir,
+                    const char *new_git_dir);
 #endif