diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-08-20 21:41:32 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-20 21:41:32 +0200 |
| commit | 2a2c18f1c3ae3fbade32df11719f24e8d6a6709c (patch) | |
| tree | feddd20937d368bfd32354954f31dcfc026b3833 /config.c | |
| parent | Merge branch 'ab/submodule-relative-url-tests' (diff) | |
| parent | git-config: document accidental multi-line setting in deprecated syntax (diff) | |
| download | git-2a2c18f1c3ae3fbade32df11719f24e8d6a6709c.tar.xz git-2a2c18f1c3ae3fbade32df11719f24e8d6a6709c.zip | |
Merge branch 'sb/config-write-fix'
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
Diffstat (limited to 'config.c')
| -rw-r--r-- | config.c | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -38,6 +38,7 @@ struct config_source { int eof; struct strbuf value; struct strbuf var; + unsigned subsection_case_sensitive : 1; int (*do_fgetc)(struct config_source *c); int (*do_ungetc)(int c, struct config_source *conf); @@ -606,6 +607,7 @@ static int get_value(config_fn_t fn, void *data, struct strbuf *name) static int get_extended_base_var(struct strbuf *name, int c) { + cf->subsection_case_sensitive = 0; do { if (c == '\n') goto error_incomplete_line; @@ -642,6 +644,7 @@ error_incomplete_line: static int get_base_var(struct strbuf *name) { + cf->subsection_case_sensitive = 1; for (;;) { int c = get_next_char(); if (cf->eof) @@ -2370,14 +2373,21 @@ static int store_aux_event(enum config_event_t type, 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); + 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 = cf->var.len - 1 == store->baselen && - !strncasecmp(cf->var.buf, store->key, store->baselen); + !cmpfn(cf->var.buf, store->key, store->baselen); if (store->is_keys_section) { store->section_seen = 1; ALLOC_GROW(store->seen, store->seen_nr + 1, |