Merge branch 'rs/daemon-fixes' into maint

diff --git a/cache.h b/cache.h
index fcb511db70f7703f2b29dbc89dcf703065c823fe..dcf3a2afe9d782e4b2474d8834602f80610ba25f 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1281,6 +1281,8 @@ extern int update_server_info(int);
 #define CONFIG_INVALID_PATTERN 6
 #define CONFIG_GENERIC_ERROR 7
 
+#define CONFIG_REGEX_NONE ((void *)1)
+
 struct git_config_source {
        unsigned int use_stdin:1;
        const char *file;