From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Sep 2014 21:05:10 +0000 (-0700)
Subject: Merge branch 'jk/command-line-config-empty-string' into maint
X-Git-Tag: v2.1.1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04cd47f553796263451c946061e175d847f388c3;p=git

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
---

04cd47f553796263451c946061e175d847f388c3
diff --cc config.c
index 058505cb8d,5390a63acb..6cbf701a8f
--- a/config.c
+++ b/config.c
@@@ -173,8 -183,8 +181,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;
  	}