summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-19 14:05:10 -0700
committerJunio C Hamano <gitster@pobox.com>2014-09-19 14:05:10 -0700
commit04cd47f553796263451c946061e175d847f388c3 (patch)
tree24bad2f1f907961c2e2af06f395b8b0fb3258fc7 /config.c
parent723361a572e8c9fe93f00b17a1f4ed02585923b2 (diff)
parenta789ca70e7a5b02973b116d21674acd795238f99 (diff)
downloadgit-04cd47f553796263451c946061e175d847f388c3.tar.gz
Merge branch 'jk/command-line-config-empty-string' into maint
* jk/command-line-config-empty-string: config: teach "git -c" to recognize an empty string Conflicts: config.c
Diffstat (limited to 'config.c')
-rw-r--r--config.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/config.c b/config.c
index 058505cb8d..6cbf701a8f 100644
--- a/config.c
+++ b/config.c
@@ -162,19 +162,27 @@ void git_config_push_parameter(const char *text)
int git_config_parse_parameter(const char *text,
config_fn_t fn, void *data)
{
+ const char *value;
struct strbuf **pair;
+
pair = strbuf_split_str(text, '=', 2);
if (!pair[0])
return error("bogus config parameter: %s", text);
- if (pair[0]->len && pair[0]->buf[pair[0]->len - 1] == '=')
+
+ if (pair[0]->len && pair[0]->buf[pair[0]->len - 1] == '=') {
strbuf_setlen(pair[0], pair[0]->len - 1);
+ value = pair[1] ? pair[1]->buf : "";
+ } else {
+ value = NULL;
+ }
+
strbuf_trim(pair[0]);
if (!pair[0]->len) {
strbuf_list_free(pair);
return error("bogus config parameter: %s", text);
}
strbuf_tolower(pair[0]);
- if (fn(pair[0]->buf, pair[1] ? pair[1]->buf : NULL, data) < 0) {
+ if (fn(pair[0]->buf, value, data) < 0) {
strbuf_list_free(pair);
return -1;
}