Re: [PATCH] make config --add behave correctly for empty and NULL values
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 11, 2014, 23:35 UTC
- Message-ID
- <xmqqy4tpbuii.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <20140819062000.GA7805@peff.net>
Jeff King <peff@peff.net> writes:
> Here is the patch I wrote, for reference (I also think breaking the > "matches" function into a series of conditionals, as you showed, is way > more readable):
OK, while reviewing the today's issue of "What's cooking" and making topics graduate to 'master', I got annoyed that the bottom of jch branch still needed to be kept. Let's do this.
-- >8 -- From: Jeff King <peff@peff.net> Date: Tue, 19 Aug 2014 02:20:00 -0400 Subject: [PATCH] config: avoid a funny sentinel value "a^"
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> --- builtin/config.c | 3 ++- cache.h | 2 ++ config.c | 23 +++++++++++++++++------ 3 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/builtin/config.c b/builtin/config.c index 8224699..bf1aa6b 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -599,7 +599,8 @@ int cmd_config(int argc, const char **argv, const char *prefix) check_argc(argc, 2, 2); value = normalize_value(argv[0], argv[1]); return git_config_set_multivar_in_file(given_config_source.file, - argv[0], value, "a^", 0); + argv[0], value, + CONFIG_REGEX_NONE, 0); } else if (actions == ACTION_REPLACE_ALL) { check_write(); diff --git a/cache.h b/cache.h index c708062..8356168 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; diff --git a/config.c b/config.c index ffe0104..2e709bf 100644 --- a/config.c +++ b/config.c @@ -1230,10 +1230,15 @@ static struct { static int matches(const char *key, const char *value) { - return !strcmp(key, store.key) && - (store.value_regex == NULL || - (store.do_not_match ^ - (value && !regexec(store.value_regex, value, 0, NULL, 0)))); + if (strcmp(key, store.key)) + return 0; /* not ours */ + if (!store.value_regex) + return 1; /* always matches */ + if (store.value_regex == CONFIG_REGEX_NONE) + return 0; /* never matches */ + + return store.do_not_match ^ + (value && !regexec(store.value_regex, value, 0, NULL, 0)); } static int store_aux(const char *key, const char *value, void *cb) @@ -1495,6 +1500,8 @@ out_free_ret_1: /* * If value==NULL, unset in (remove from) config, * if value_regex!=NULL, disregard key/value pairs where value does not match. + * if value_regex==CONFIG_REGEX_NONE, do not match any existing values + * (only add a new one) * if multi_replace==0, nothing, or only one matching key/value is replaced, * else all matching key/values (regardless how many) are removed, * before the new pair is written. @@ -1578,6 +1585,8 @@ int git_config_set_multivar_in_file(const char *config_filename, if (value_regex == NULL) store.value_regex = NULL; + else if (value_regex == CONFIG_REGEX_NONE) + store.value_regex = CONFIG_REGEX_NONE; else { if (value_regex[0] == '!') { store.do_not_match = 1; @@ -1609,7 +1618,8 @@ int git_config_set_multivar_in_file(const char *config_filename, if (git_config_from_file(store_aux, config_filename, NULL)) { error("invalid config file %s", config_filename); free(store.key); - if (store.value_regex != NULL) { + if (store.value_regex != NULL && + store.value_regex != CONFIG_REGEX_NONE) { regfree(store.value_regex); free(store.value_regex); } @@ -1618,7 +1628,8 @@ int git_config_set_multivar_in_file(const char *config_filename, } free(store.key); - if (store.value_regex != NULL) { + if (store.value_regex != NULL && + store.value_regex != CONFIG_REGEX_NONE) { regfree(store.value_regex); free(store.value_regex); }
-- 2.1.0-466-g6597b3e