Merge branch 'sb/config-write-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 19:41:32 +0000 (12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Aug 2018 19:41:32 +0000 (12:41 -0700)
Recent update to "git config" broke updating variable in a
subsection, which has been corrected.

* sb/config-write-fix:
git-config: document accidental multi-line setting in deprecated syntax
config: fix case sensitive subsection names on writing
t1300: document current behavior of setting options

1  2 
Documentation/git-config.txt
config.c
t/t1300-config.sh
Simple merge
diff --cc config.c
index f97ea347568695a19d1d339e35084e11c68ea85d,27e800c7ce8b343923433e9d1f6f96ff12ad4065..9a0b10d4bc23fc0381ea61b492c1199e91ae5861
+++ b/config.c
@@@ -2370,9 -2331,16 +2373,16 @@@ static int store_aux_event(enum config_
        store->parsed[store->parsed_nr].type = type;
  
        if (type == CONFIG_EVENT_SECTION) {
+               int (*cmpfn)(const char *, const char *, size_t);
                if (cf->var.len < 2 || cf->var.buf[cf->var.len - 1] != '.')
 -                      return error("invalid section name '%s'", cf->var.buf);
 +                      return error(_("invalid section name '%s'"), cf->var.buf);
  
+               if (cf->subsection_case_sensitive)
+                       cmpfn = strncasecmp;
+               else
+                       cmpfn = strncmp;
                /* Is this the section we were looking for? */
                store->is_keys_section =
                        store->parsed[store->parsed_nr].is_keys_section =
Simple merge