oneway_merge(): only lstat() when told to update worktree

diff --git a/dir.h b/dir.h
index 6c73e4151de8374d35427358cde50b506a2d7de9..893465a1e89d17cf5f94d3e68be1371f03e6163d 100644 (file)
--- a/dir.h
+++ b/dir.h
@@ -9,7 +9,6 @@ struct dir_entry {
 };
 
 #define EXC_FLAG_NODIR 1
-#define EXC_FLAG_NOWILDCARD 2
 #define EXC_FLAG_ENDSWITH 4
 #define EXC_FLAG_MUSTBEDIR 8
 
@@ -19,6 +18,7 @@ struct exclude_list {
        struct exclude {
                const char *pattern;
                int patternlen;
+               int nowildcardlen;
                const char *base;
                int baselen;
                int to_exclude;