summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2014-08-19 02:20:00 -0400
committerJunio C Hamano <gitster@pobox.com>2014-09-11 16:33:54 -0700
commitc1063be2a3e14ac042db4fe9b9bcea8f2768886a (patch)
tree2859019665ab4774fe6699ae06d0aa67e17ae8db /cache.h
parentc8466645edd1413c7efed824f5bddac457eb77f9 (diff)
downloadgit-c1063be2a3e14ac042db4fe9b9bcea8f2768886a.tar.gz
config: avoid a funny sentinel value "a^"ta/config-add-to-empty-or-true-fix
Introduce CONFIG_REGEX_NONE as a more explicit sentinel value to say "we do not want to replace any existing entry" and use it in the implementation of "git config --add". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index c708062df9..8356168bb5 100644
--- a/cache.h
+++ b/cache.h
@@ -1233,6 +1233,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;