summary refs log tree commit diff
path: root/wildmatch.h
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2012-10-15 13:26:00 +0700
committerJunio C Hamano <gitster@pobox.com>2012-10-15 14:58:18 -0700
commit40bbee0ab07d0ee4f21b11d597c878245c1b05a6 (patch)
treea966918d4df85bb7a398d4b37286b4ba731b7e98 /wildmatch.h
parent164bf83af6466e03b306b9d63dcf7d36dda2bdae (diff)
wildmatch: adjust "**" behavior
Standard wildmatch() sees consecutive asterisks as "*" that can also
match slashes. But that may be hard to explain to users as
"abc/**/def" can match "abcdef", "abcxyzdef", "abc/def", "abc/x/def",
"abc/x/y/def"...

This patch changes wildmatch so that users can do

- "**/def" -> all paths ending with file/directory 'def'
- "abc/**" - equivalent to "/abc/"
- "abc/**/def" -> "abc/x/def", "abc/x/y/def"...
- otherwise consider the pattern malformed if "**" is found

Basically the magic of "**" only remains if it's wrapped around by
slashes.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'wildmatch.h')
-rw-r--r--wildmatch.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/wildmatch.h b/wildmatch.h
index e974f9abce..984a38cdc2 100644
--- a/wildmatch.h
+++ b/wildmatch.h
@@ -1,3 +1,9 @@
 /* wildmatch.h */
 
+#define ABORT_MALFORMED 2
+#define NOMATCH 1
+#define MATCH 0
+#define ABORT_ALL -1
+#define ABORT_TO_STARSTAR -2
+
 int wildmatch(const char *pattern, const char *text, int flags);