From: Jacob Keller <jacob.e.keller@intel.com>
To: <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Jacob Keller <jacob.keller@gmail.com>
Subject: [PATCH v3 2/4] pathspec: expose match_pathspec_with_flags
Date: Mon, 19 May 2025 17:01:23 -0700 [thread overview]
Message-ID: <20250520000125.2162144-3-jacob.e.keller@intel.com> (raw)
In-Reply-To: <20250520000125.2162144-1-jacob.e.keller@intel.com>
From: Jacob Keller <jacob.keller@gmail.com>
The do_match_pathspec() function has the DO_MATCH_LEADING_PATHSPEC
option to allow pathspecs to match when matching "src" against a
pathspec like "src/path/...". This support is not exposed by
match_pathspec, and the internal flags to do_match_pathspec are not
exposed outside of dir.c
Make match_pathspec_with_flags public, and expose the
DO_MATCH_LEADING_PATHSPEC and DO_MATCH_DIRECTORY flags. The
DO_MATCH_EXCLUDE flag is kept private in dir.c
This will be used in a an extension to support pathspec matching in git
diff --no-index.
Signed-off-by: Jacob Keller <jacob.keller@gmail.com>
---
pathspec.h | 8 ++++++++
dir.c | 11 +++++------
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/pathspec.h b/pathspec.h
index de537cff3cb6..d22d4e80248d 100644
--- a/pathspec.h
+++ b/pathspec.h
@@ -184,6 +184,14 @@ int match_pathspec(struct index_state *istate,
const char *name, int namelen,
int prefix, char *seen, int is_dir);
+#define DO_MATCH_DIRECTORY (1<<1)
+#define DO_MATCH_LEADING_PATHSPEC (1<<2)
+
+int match_pathspec_with_flags(struct index_state *istate,
+ const struct pathspec *ps,
+ const char *name, int namelen,
+ int prefix, char *seen, unsigned flags);
+
/*
* Determine whether a pathspec will match only entire index entries (non-sparse
* files and/or entire sparse directories). If the pathspec has the potential to
diff --git a/dir.c b/dir.c
index a374972b6243..2f2b654b0252 100644
--- a/dir.c
+++ b/dir.c
@@ -329,9 +329,8 @@ static int do_read_blob(const struct object_id *oid, struct oid_stat *oid_stat,
return 1;
}
+// DO_MATCH_EXCLUDE is not public
#define DO_MATCH_EXCLUDE (1<<0)
-#define DO_MATCH_DIRECTORY (1<<1)
-#define DO_MATCH_LEADING_PATHSPEC (1<<2)
/*
* Does the given pathspec match the given name? A match is found if
@@ -551,10 +550,10 @@ static int do_match_pathspec(struct index_state *istate,
return retval;
}
-static int match_pathspec_with_flags(struct index_state *istate,
- const struct pathspec *ps,
- const char *name, int namelen,
- int prefix, char *seen, unsigned flags)
+int match_pathspec_with_flags(struct index_state *istate,
+ const struct pathspec *ps,
+ const char *name, int namelen,
+ int prefix, char *seen, unsigned flags)
{
int positive, negative;
positive = do_match_pathspec(istate, ps, name, namelen,
--
2.48.1.397.gec9d649cc640
next prev parent reply other threads:[~2025-05-20 0:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-20 0:01 [PATCH v3 0/4] diff: add pathspec support to --no-index Jacob Keller
2025-05-20 0:01 ` [PATCH v3 1/4] prefix_path: support prefixes not ending in trailing slash Jacob Keller
2025-05-20 14:35 ` Junio C Hamano
2025-05-20 22:34 ` Jacob Keller
2025-05-20 0:01 ` Jacob Keller [this message]
2025-05-20 14:39 ` [PATCH v3 2/4] pathspec: expose match_pathspec_with_flags Junio C Hamano
2025-05-20 22:38 ` Jacob Keller
2025-05-20 0:01 ` [PATCH v3 3/4] pathspec: add flag to indicate operation without repository Jacob Keller
2025-05-20 15:13 ` Junio C Hamano
2025-05-20 22:42 ` Jacob Keller
2025-05-21 23:05 ` Jacob Keller
2025-05-20 0:01 ` [PATCH v3 4/4] diff --no-index: support limiting by pathspec Jacob Keller
2025-05-20 16:30 ` Junio C Hamano
2025-05-20 22:45 ` Jacob Keller
2025-05-20 22:47 ` Jacob Keller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250520000125.2162144-3-jacob.e.keller@intel.com \
--to=jacob.e.keller@intel.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jacob.keller@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).