summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-19 11:38:40 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-19 11:38:40 -0700
commit4daf5c864348e8d2002b082d8ac484c650e395d4 (patch)
tree9d5d764dd36e3d502302bed2591b29dd3be440c4 /cache.h
parent9d6db4a28ddbaf66bbc257251e97e9511a9148fd (diff)
parentc1063be2a3e14ac042db4fe9b9bcea8f2768886a (diff)
downloadgit-4daf5c864348e8d2002b082d8ac484c650e395d4.tar.gz
Merge branch 'ta/config-add-to-empty-or-true-fix'
"git config --add section.var val" used to lose existing section.var whose value was an empty string. * ta/config-add-to-empty-or-true-fix: config: avoid a funny sentinel value "a^" make config --add behave correctly for empty and NULL values
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 db4ccd1cf7..af590d5077 100644
--- a/cache.h
+++ b/cache.h
@@ -1285,6 +1285,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;