Merge branch 'jk/command-line-config-empty-string'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:53:56 +0000 (12:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:53:57 +0000 (12:53 -0700)
"git -c section.var command" and "git -c section.var= command"
should pass the configuration differently (the former should be
a boolean true, the latter should be an empty string).

* jk/command-line-config-empty-string:
config: teach "git -c" to recognize an empty string

1  2 
Documentation/git.txt
config.c
t/t1300-repo-config.sh
Simple merge
diff --cc config.c
index a191328a9d6a85909a7720b8120b70d98c12e092,5390a63acb372eaa18ba4e83022789155fcc1c1f..01e0bdbafd4d43a7fb983449c78d711d22dd2375
+++ b/config.c
@@@ -188,8 -183,8 +196,8 @@@ int git_config_parse_parameter(const ch
                strbuf_list_free(pair);
                return error("bogus config parameter: %s", text);
        }
 -      lowercase(pair[0]->buf);
 +      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;
        }
Simple merge