pathspec: convert some match_pathspec_depth() to ce_path_match()

This helps reduce the number of match_pathspec_depth() call sites and
show how match_pathspec_depth() is used.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 5df3837e3102e2f7d432ec11bb4685535bfaa0ac..ada51fa70ff59b10fd79168a4377d923638591e9 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -297,8 +297,7 @@ static int checkout_paths(const struct checkout_opts *opts,
                 * match_pathspec() for _all_ entries when
                 * opts->source_tree != NULL.
                 */
                 * match_pathspec() for _all_ entries when
                 * opts->source_tree != NULL.
                 */

-               if (match_pathspec_depth(&opts->pathspec, ce->name, ce_namelen(ce),
-                                  0, ps_matched))
+               if (ce_path_match(ce, &opts->pathspec, ps_matched))

                        ce->ce_flags |= CE_MATCHED;
        }
 
                        ce->ce_flags |= CE_MATCHED;
        }
 

diff --git a/builtin/commit.c b/builtin/commit.c
index 3767478c6ddb02cf8a4a418f8911102aeaacfbe8..26b2986abe679b594798748b4776917050b1bd4d 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -234,7 +234,7 @@ static int list_paths(struct string_list *list, const char *with_tree,
 
                if (ce->ce_flags & CE_UPDATE)
                        continue;
 
                if (ce->ce_flags & CE_UPDATE)
                        continue;

-               if (!match_pathspec_depth(pattern, ce->name, ce_namelen(ce), 0, m))
+               if (!ce_path_match(ce, pattern, m))

                        continue;
                item = string_list_insert(list, ce->name);
                if (ce_skip_worktree(ce))
                        continue;
                item = string_list_insert(list, ce->name);
                if (ce_skip_worktree(ce))

diff --git a/builtin/grep.c b/builtin/grep.c
index 63f86032d91f00fc607f7d3b26ec941bb7a4c76c..3d924c25a574b5277e2d6d5dccafcb687f0e8b53 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -379,7 +379,7 @@ static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec, int
                const struct cache_entry *ce = active_cache[nr];
                if (!S_ISREG(ce->ce_mode))
                        continue;
                const struct cache_entry *ce = active_cache[nr];
                if (!S_ISREG(ce->ce_mode))
                        continue;

-               if (!match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL))
+               if (!ce_path_match(ce, pathspec, NULL))

                        continue;
                /*
                 * If CE_VALID is on, we assume worktree file and its cache entry
                        continue;
                /*
                 * If CE_VALID is on, we assume worktree file and its cache entry

diff --git a/builtin/rm.c b/builtin/rm.c
index 3a0e0eaab7d1fd8a298bb2519776abede5c685e2..05642184c5d89addae1900660ad99e5f29c324f2 100644 (file)
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -308,7 +308,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 
        for (i = 0; i < active_nr; i++) {
                const struct cache_entry *ce = active_cache[i];
 
        for (i = 0; i < active_nr; i++) {
                const struct cache_entry *ce = active_cache[i];

-               if (!match_pathspec_depth(&pathspec, ce->name, ce_namelen(ce), 0, seen))
+               if (!ce_path_match(ce, &pathspec, seen))

                        continue;
                ALLOC_GROW(list.entry, list.nr + 1, list.alloc);
                list.entry[list.nr].name = ce->name;
                        continue;
                ALLOC_GROW(list.entry, list.nr + 1, list.alloc);
                list.entry[list.nr].name = ce->name;

diff --git a/builtin/update-index.c b/builtin/update-index.c
index e3a10d706d406845b74b2cc0c9e9a120be6adce0..aaa6f78f1629311257291ba1075ddd7c7dd1a3ed 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -12,6 +12,7 @@
 #include "resolve-undo.h"
 #include "parse-options.h"
 #include "pathspec.h"
 #include "resolve-undo.h"
 #include "parse-options.h"
 #include "pathspec.h"

+#include "dir.h"

 
 /*
  * Default to not allowing changes to the list of files. The
 
 /*
  * Default to not allowing changes to the list of files. The


@@ -564,7 +565,7 @@ static int do_reupdate(int ac, const char **av,
                struct cache_entry *old = NULL;
                int save_nr;
 
                struct cache_entry *old = NULL;
                int save_nr;
 

-               if (ce_stage(ce) || !ce_path_match(ce, &pathspec))
+               if (ce_stage(ce) || !ce_path_match(ce, &pathspec, NULL))

                        continue;
                if (has_head)
                        old = read_one_ent(NULL, head_sha1,
                        continue;
                if (has_head)
                        old = read_one_ent(NULL, head_sha1,

diff --git a/cache.h b/cache.h
index dc040fb1aa99b7970e85e5b175e60f862ff6a74a..aa6dbf6956b5a06733b8a35f8d45c3463ceac776 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -501,8 +501,6 @@ extern void *read_blob_data_from_index(struct index_state *, const char *, unsig
 extern int ie_match_stat(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
 extern int ie_modified(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
 
 extern int ie_match_stat(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
 extern int ie_modified(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
 

-extern int ce_path_match(const struct cache_entry *ce, const struct pathspec *pathspec);
-

 #define HASH_WRITE_OBJECT 1
 #define HASH_FORMAT_CHECK 2
 extern int index_fd(unsigned char *sha1, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);
 #define HASH_WRITE_OBJECT 1
 #define HASH_FORMAT_CHECK 2
 extern int index_fd(unsigned char *sha1, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);

diff --git a/diff-lib.c b/diff-lib.c
index 346cac651da725af07a304194d8d8e04b2f080b7..2eddc66bbd5cf37e4649e219a28c951ed134557c 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -11,6 +11,7 @@
 #include "unpack-trees.h"
 #include "refs.h"
 #include "submodule.h"
 #include "unpack-trees.h"
 #include "refs.h"
 #include "submodule.h"

+#include "dir.h"

 
 /*
  * diff-files
 
 /*
  * diff-files


@@ -108,7 +109,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
                if (diff_can_quit_early(&revs->diffopt))
                        break;
 
                if (diff_can_quit_early(&revs->diffopt))
                        break;
 

-               if (!ce_path_match(ce, &revs->prune_data))
+               if (!ce_path_match(ce, &revs->prune_data, NULL))

                        continue;
 
                if (ce_stage(ce)) {
                        continue;
 
                if (ce_stage(ce)) {


@@ -438,7 +439,7 @@ static int oneway_diff(const struct cache_entry * const *src,
        if (tree == o->df_conflict_entry)
                tree = NULL;
 
        if (tree == o->df_conflict_entry)
                tree = NULL;
 

-       if (ce_path_match(idx ? idx : tree, &revs->prune_data)) {
+       if (ce_path_match(idx ? idx : tree, &revs->prune_data, NULL)) {

                do_oneway_diff(o, idx, tree);
                if (diff_can_quit_early(&revs->diffopt)) {
                        o->exiting_early = 1;
                do_oneway_diff(o, idx, tree);
                if (diff_can_quit_early(&revs->diffopt)) {
                        o->exiting_early = 1;

diff --git a/dir.h b/dir.h
index 9b7e4e77d8b11bab92a91a6ce3e8920e50d23f9b..42793e582ffc8b17da2499ec06b3495de040042f 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -205,4 +205,11 @@ extern int git_fnmatch(const struct pathspec_item *item,
                       const char *pattern, const char *string,
                       int prefix);
 
                       const char *pattern, const char *string,
                       int prefix);
 

+static inline int ce_path_match(const struct cache_entry *ce,
+                               const struct pathspec *pathspec,
+                               char *seen)
+{
+       return match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, seen);
+}
+

 #endif
 #endif

diff --git a/pathspec.c b/pathspec.c
index 6cb9fd3014a424d11647e48de3b841012ccc2ffe..80430999553d8fda8d095b007bb08c1999bf6993 100644 (file)
--- a/pathspec.c
+++ b/pathspec.c
@@ -33,7 +33,7 @@ void add_pathspec_matches_against_index(const struct pathspec *pathspec,
                return;
        for (i = 0; i < active_nr; i++) {
                const struct cache_entry *ce = active_cache[i];
                return;
        for (i = 0; i < active_nr; i++) {
                const struct cache_entry *ce = active_cache[i];

-               match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, seen);
+               ce_path_match(ce, pathspec, seen);

        }
 }
 
        }
 }
 

diff --git a/preload-index.c b/preload-index.c
index 8c44ceb2c715936b314fc10a7aae3dfb44172327..968ee25eae13f82fe4f93254d77660456732a5c6 100644 (file)
--- a/preload-index.c
+++ b/preload-index.c
@@ -3,6 +3,7 @@
  */
 #include "cache.h"
 #include "pathspec.h"
  */
 #include "cache.h"
 #include "pathspec.h"

+#include "dir.h"

 
 #ifdef NO_PTHREADS
 static void preload_index(struct index_state *index,
 
 #ifdef NO_PTHREADS
 static void preload_index(struct index_state *index,


@@ -53,7 +54,7 @@ static void *preload_thread(void *_data)
                        continue;
                if (ce_uptodate(ce))
                        continue;
                        continue;
                if (ce_uptodate(ce))
                        continue;

-               if (!ce_path_match(ce, &p->pathspec))
+               if (!ce_path_match(ce, &p->pathspec, NULL))

                        continue;
                if (threaded_has_symlink_leading_path(&cache, ce->name, ce_namelen(ce)))
                        continue;
                        continue;
                if (threaded_has_symlink_leading_path(&cache, ce->name, ce_namelen(ce)))
                        continue;

diff --git a/read-cache.c b/read-cache.c
index 33dd676ccbbd24e0bace49347f1f5d81b5099bcc..23eb2513c139fa1f775040fe1a5ffd2558a3c418 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -728,11 +728,6 @@ int ce_same_name(const struct cache_entry *a, const struct cache_entry *b)
        return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
 }
 
        return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
 }
 

-int ce_path_match(const struct cache_entry *ce, const struct pathspec *pathspec)
-{
-       return match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL);
-}
-

 /*
  * We fundamentally don't like some paths: we don't want
  * dot or dot-dot anywhere, and for obvious reasons don't
 /*
  * We fundamentally don't like some paths: we don't want
  * dot or dot-dot anywhere, and for obvious reasons don't


@@ -1149,8 +1144,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
                if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
                        continue;
 
                if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
                        continue;
 

-               if (pathspec &&
-                   !match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, seen))
+               if (pathspec && !ce_path_match(ce, pathspec, seen))

                        filtered = 1;
 
                if (ce_stage(ce)) {
                        filtered = 1;
 
                if (ce_stage(ce)) {

diff --git a/resolve-undo.c b/resolve-undo.c
index c09b00664e6892c84424bb4984152883460d3df6..67d1543141bf33b7a44e7f948e9750d35ebf420b 100644 (file)
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -182,7 +182,7 @@ void unmerge_index(struct index_state *istate, const struct pathspec *pathspec)
 
        for (i = 0; i < istate->cache_nr; i++) {
                const struct cache_entry *ce = istate->cache[i];
 
        for (i = 0; i < istate->cache_nr; i++) {
                const struct cache_entry *ce = istate->cache[i];

-               if (!match_pathspec_depth(pathspec, ce->name, ce_namelen(ce), 0, NULL))
+               if (!ce_path_match(ce, pathspec, NULL))

                        continue;
                i = unmerge_index_entry_at(istate, i);
        }
                        continue;
                i = unmerge_index_entry_at(istate, i);
        }

diff --git a/revision.c b/revision.c
index a0df72f32c100a68e5d99b5b00e597d43f3802a5..f40ccf14269a3325f4f3069ce931bb73e1d1f27e 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -16,6 +16,7 @@
 #include "line-log.h"
 #include "mailmap.h"
 #include "commit-slab.h"
 #include "line-log.h"
 #include "mailmap.h"
 #include "commit-slab.h"

+#include "dir.h"

 
 volatile show_early_output_fn_t show_early_output;
 
 
 volatile show_early_output_fn_t show_early_output;
 


@@ -1400,7 +1401,7 @@ static void prepare_show_merge(struct rev_info *revs)
                const struct cache_entry *ce = active_cache[i];
                if (!ce_stage(ce))
                        continue;
                const struct cache_entry *ce = active_cache[i];
                if (!ce_stage(ce))
                        continue;

-               if (ce_path_match(ce, &revs->prune_data)) {
+               if (ce_path_match(ce, &revs->prune_data, NULL)) {

                        prune_num++;
                        prune = xrealloc(prune, sizeof(*prune) * prune_num);
                        prune[prune_num-2] = ce->name;
                        prune_num++;
                        prune = xrealloc(prune, sizeof(*prune) * prune_num);
                        prune[prune_num-2] = ce->name;

diff --git a/wt-status.c b/wt-status.c
index 4e5581005936a1e7832e3ab224cfe142ac777a63..295c09e3fc9180ad059e454a3fd7ebe0ee9c45ce 100644 (file)
--- a/wt-status.c
+++ b/wt-status.c
@@ -510,7 +510,7 @@ static void wt_status_collect_changes_initial(struct wt_status *s)
                struct wt_status_change_data *d;
                const struct cache_entry *ce = active_cache[i];
 
                struct wt_status_change_data *d;
                const struct cache_entry *ce = active_cache[i];
 

-               if (!ce_path_match(ce, &s->pathspec))
+               if (!ce_path_match(ce, &s->pathspec, NULL))

                        continue;
                it = string_list_insert(&s->change, ce->name);
                d = it->util;
                        continue;
                it = string_list_insert(&s->change, ce->name);
                d = it->util;