diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-05-08 09:59:18 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-08 09:59:18 +0300 |
commit | 4f4d0b42bae8091fd989aa6d7db72ecdd86aa36b (patch) | |
tree | a0b15e8fa1e918fe12d58fde93f3d656462f820a /notes-merge.h | |
parent | b7da73ac8b953afd788e096b5b216e3bd9845659 (diff) | |
parent | c71d8bb38a73abc910a63bf7a81f3869dc9c2f34 (diff) |
Merge branch 'js/empty-config-section-fix'
"git config --unset a.b", when "a.b" is the last variable in an
otherwise empty section "a", left an empty section "a" behind, and
worse yet, a subsequent "git config a.c value" did not reuse that
empty shell and instead created a new one. These have been
(partially) corrected.
* js/empty-config-section-fix:
git_config_set: reuse empty sections
git config --unset: remove empty sections (in the common case)
git_config_set: make use of the config parser's event stream
git_config_set: do not use a state machine
config_set_store: rename some fields for consistency
config: avoid using the global variable `store`
config: introduce an optional event stream while parsing
t1300: `--unset-all` can leave an empty section behind (bug)
t1300: add a few more hairy examples of sections becoming empty
t1300: remove unreasonable expectation from TODO
t1300: avoid relying on a bug
config --replace-all: avoid extra line breaks
t1300: demonstrate that --replace-all can "invent" newlines
t1300: rename it to reflect that `repo-config` was deprecated
git_config_set: fix off-by-two
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions