diff options
| author | Elijah Newren <newren@gmail.com> | 2019-09-17 16:34:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-17 19:20:35 (GMT) |
| commit | a3d89d8f7681c61c7fe04a0c01c7310a375f3d0e (patch) | |
| tree | fd6e9ee632008a84af9abf98e38256826203baa0 /dir.c | |
| parent | 404ebceda01c5af68926c3ee78934cd95bda2602 (diff) | |
| download | git-a3d89d8f7681c61c7fe04a0c01c7310a375f3d0e.zip git-a3d89d8f7681c61c7fe04a0c01c7310a375f3d0e.tar.gz git-a3d89d8f7681c61c7fe04a0c01c7310a375f3d0e.tar.bz2 | |
dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case
The specific checks done in match_pathspec_item for the DO_MATCH_SUBMODULE
case are useful for other cases which have nothing to do with submodules.
Rename this constant; a subsequent commit will make use of this change.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.c')
| -rw-r--r-- | dir.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -273,7 +273,7 @@ static int do_read_blob(const struct object_id *oid, struct oid_stat *oid_stat, #define DO_MATCH_EXCLUDE (1<<0) #define DO_MATCH_DIRECTORY (1<<1) -#define DO_MATCH_SUBMODULE (1<<2) +#define DO_MATCH_LEADING_PATHSPEC (1<<2) /* * Does 'match' match the given name? @@ -354,7 +354,7 @@ static int match_pathspec_item(const struct index_state *istate, return MATCHED_FNMATCH; /* Perform checks to see if "name" is a super set of the pathspec */ - if (flags & DO_MATCH_SUBMODULE) { + if (flags & DO_MATCH_LEADING_PATHSPEC) { /* name is a literal prefix of the pathspec */ int offset = name[namelen-1] == '/' ? 1 : 0; if ((namelen < matchlen) && @@ -498,7 +498,7 @@ int submodule_path_match(const struct index_state *istate, strlen(submodule_name), 0, seen, DO_MATCH_DIRECTORY | - DO_MATCH_SUBMODULE); + DO_MATCH_LEADING_PATHSPEC); return matched; } |