Merge branch 'pc/dir-count-slashes'

Three instances of the same helper function have been consolidated
to one.

* pc/dir-count-slashes:
  dir: create function count_slashes()

diff --cc apply.c
Simple merge

diff --cc builtin/show-branch.c
Simple merge

diff --cc dir.c
index 17590638176f26e35f3a728e5cd56917e0568541,a870f42ddc9aecfd571b753df14af363b2872cde..5f1afb56bc6e6d5dc5300380f980f4b2699ab08d
--- 1/dir.c
--- 2/dir.c
+++ b/dir.c
@@@ -46,12 -45,19 +46,21 @@@ struct cached_dir 
  };
  
  static enum path_treatment read_directory_recursive(struct dir_struct *dir,
 -      const char *path, int len, struct untracked_cache_dir *untracked,
 +      struct index_state *istate, const char *path, int len,
 +      struct untracked_cache_dir *untracked,
        int check_only, const struct pathspec *pathspec);
 -static int get_dtype(struct dirent *de, const char *path, int len);
 +static int get_dtype(struct dirent *de, struct index_state *istate,
 +                   const char *path, int len);
  
+ int count_slashes(const char *s)
+ {
+       int cnt = 0;
+       while (*s)
+               if (*s++ == '/')
+                       cnt++;
+       return cnt;
+ }
+ 
  int fspathcmp(const char *a, const char *b)
  {
        return ignore_case ? strcasecmp(a, b) : strcmp(a, b);

diff --cc dir.h
Simple merge