summaryrefslogtreecommitdiff
path: root/builtin/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-30 05:10:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-09-30 05:10:25 (GMT)
commit102edda4dfa3f2119119c2b52c90a9337a03178f (patch)
treec6f34cca5c4935b30fce5cf1c9841ee731db0d4b /builtin/config.c
parent421ec4f8d1f616ba3cb82204e9973be45b61eea0 (diff)
parentc1063be2a3e14ac042db4fe9b9bcea8f2768886a (diff)
downloadgit-102edda4dfa3f2119119c2b52c90a9337a03178f.zip
git-102edda4dfa3f2119119c2b52c90a9337a03178f.tar.gz
git-102edda4dfa3f2119119c2b52c90a9337a03178f.tar.bz2
Merge branch 'ta/config-add-to-empty-or-true-fix' into maint
"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 'builtin/config.c')
-rw-r--r--builtin/config.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/config.c b/builtin/config.c
index fcd8474..7bba516 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -586,7 +586,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, "^$", 0);
+ argv[0], value,
+ CONFIG_REGEX_NONE, 0);
}
else if (actions == ACTION_REPLACE_ALL) {
check_write();