summaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2016-02-15 09:03:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-02-15 23:32:32 (GMT)
commitc62a91736a6dcd909167cf9fbb751d65c85482dd (patch)
treecb3dbd66d3c3397585a32bc73af891508d8a3fae /dir.h
parentbac65a2be598811d944c846bdf61580f5c1af927 (diff)
downloadgit-c62a91736a6dcd909167cf9fbb751d65c85482dd.zip
git-c62a91736a6dcd909167cf9fbb751d65c85482dd.tar.gz
git-c62a91736a6dcd909167cf9fbb751d65c85482dd.tar.bz2
dir.c: support marking some patterns already matched
Given path "a" and the pattern "a", it's matched. But if we throw path "a/b" to pattern "a", the code fails to realize that if "a" matches "a" then "a/b" should also be matched. When the pattern is matched the first time, we can mark it "sticky", so that all files and dirs inside the matched path also matches. This is a simpler solution than modify all match scenarios to fix that. 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 'dir.h')
-rw-r--r--dir.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/dir.h b/dir.h
index cd46f30..3ec3fb0 100644
--- a/dir.h
+++ b/dir.h
@@ -4,6 +4,7 @@
/* See Documentation/technical/api-directory-listing.txt */
#include "strbuf.h"
+#include "string-list.h"
struct dir_entry {
unsigned int len;
@@ -34,6 +35,8 @@ struct exclude {
* and from -1 decrementing for patterns from CLI args.
*/
int srcpos;
+
+ struct string_list sticky_paths;
};
/*