From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Thomas Rast" <tr@thomasrast.ch>,
"Phil Haack" <haacked@gmail.com>, "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Stefan Beller" <sbeller@google.com>,
"Jason Frey" <jfrey@redhat.com>,
"Philip Oakley" <philipoakley@iee.org>
Subject: [PATCH v2 14/15] git_config_set: reuse empty sections
Date: Tue, 3 Apr 2018 18:29:04 +0200 (DST) [thread overview]
Message-ID: <000be096b9a3ece6374ca5d0bf5eb3c2a872bf2f.1522772789.git.johannes.schindelin@gmx.de> (raw)
In-Reply-To: <cover.1522772789.git.johannes.schindelin@gmx.de>
It can happen quite easily that the last setting in a config section is
removed, and to avoid confusion when there are comments in the config
about that section, we keep a lone section header, i.e. an empty
section.
Now that we use the `event_fn` callback, it is easy to add support for
re-using empty sections, so let's do that.
Note: t5512-ls-remote requires that this change is applied *after* the
patch "git config --unset: remove empty sections (in the common case)":
without that patch, there would be empty `transfer` and `uploadpack`
sections ready for reuse, but in the *wrong* order (and sconsequently,
t5512's "overrides work between mixed transfer/upload-pack hideRefs"
would fail).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
config.c | 14 +++++++++++++-
t/t1300-config.sh | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/config.c b/config.c
index 271e9605ec1..ee7ea24123d 100644
--- a/config.c
+++ b/config.c
@@ -2345,6 +2345,12 @@ static int store_aux_event(enum config_event_t type,
store->parsed[store->parsed_nr].is_keys_section =
cf->var.len - 1 == store->baselen &&
!strncasecmp(cf->var.buf, store->key, store->baselen);
+ if (store->is_keys_section) {
+ store->section_seen = 1;
+ ALLOC_GROW(store->seen, store->seen_nr + 1,
+ store->seen_alloc);
+ store->seen[store->seen_nr] = store->parsed_nr;
+ }
}
store->parsed_nr++;
@@ -2779,7 +2785,13 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
new_line = 0;
if (!store.key_seen) {
- replace_end = copy_end = store.parsed[j].end;
+ copy_end = store.parsed[j].end;
+ /* include '\n' when copying section header */
+ if (copy_end > 0 && copy_end < contents_sz &&
+ contents[copy_end - 1] != '\n' &&
+ contents[copy_end] == '\n')
+ copy_end++;
+ replace_end = copy_end;
} else {
replace_end = store.parsed[j].end;
copy_end = store.parsed[j].begin;
diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 6d34513eedd..6d0e13020d1 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -1463,7 +1463,7 @@ test_expect_success '--unset-all removes section if empty & uncommented' '
test_line_count = 0 .git/config
'
-test_expect_failure 'adding a key into an empty section reuses header' '
+test_expect_success 'adding a key into an empty section reuses header' '
cat >.git/config <<-\EOF &&
[section]
EOF
--
2.16.2.windows.1.26.g2cc3565eb4b
next prev parent reply other threads:[~2018-04-03 16:29 UTC|newest]
Thread overview: 103+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-29 15:18 [PATCH 0/9] Assorted fixes for `git config` (including the "empty sections" bug) Johannes Schindelin
2018-03-29 15:18 ` [PATCH 1/9] git_config_set: fix off-by-two Johannes Schindelin
2018-03-29 18:15 ` Stefan Beller
2018-03-29 19:41 ` Jeff King
2018-03-30 12:32 ` Johannes Schindelin
2018-03-30 14:15 ` Ævar Arnfjörð Bjarmason
2018-03-30 16:24 ` Junio C Hamano
2018-03-30 18:44 ` Johannes Schindelin
2018-03-30 19:00 ` Junio C Hamano
2018-04-03 9:31 ` Johannes Schindelin
2018-04-03 15:29 ` Duy Nguyen
2018-04-03 15:47 ` Johannes Schindelin
2018-04-08 23:12 ` Junio C Hamano
2018-03-30 16:36 ` Duy Nguyen
2018-03-30 18:53 ` Johannes Schindelin
2018-03-30 19:16 ` Duy Nguyen
2018-03-30 18:45 ` A potential approach to making tests faster on Windows Ævar Arnfjörð Bjarmason
2018-03-30 18:58 ` Junio C Hamano
2018-03-30 19:16 ` Jeff King
2018-04-03 9:49 ` Johannes Schindelin
2018-04-03 11:28 ` Ævar Arnfjörð Bjarmason
2018-04-03 15:55 ` Johannes Schindelin
2018-04-03 21:36 ` Eric Sunshine
2018-04-03 11:43 ` Johannes Schindelin
2018-04-03 13:27 ` Jeff King
2018-04-03 16:00 ` Johannes Schindelin
2018-04-06 21:40 ` Jeff King
2018-04-06 21:57 ` Stefan Beller
2018-03-29 15:18 ` [PATCH 2/9] t1300: rename it to reflect that `repo-config` was deprecated Johannes Schindelin
2018-03-29 19:42 ` Jeff King
2018-03-30 12:37 ` Johannes Schindelin
2018-03-29 15:18 ` [PATCH 3/9] t1300: avoid relying on a bug Johannes Schindelin
2018-03-29 19:43 ` Jeff King
2018-03-30 12:38 ` Johannes Schindelin
2018-03-29 15:18 ` [PATCH 4/9] t1300: remove unreasonable expectation from TODO Johannes Schindelin
2018-03-29 19:52 ` Jeff King
2018-03-29 20:45 ` Junio C Hamano
2018-03-30 12:42 ` Johannes Schindelin
2018-03-29 15:18 ` [PATCH 5/9] t1300: `--unset-all` can leave an empty section behind (bug) Johannes Schindelin
2018-03-29 19:54 ` Jeff King
2018-03-29 15:18 ` [PATCH 6/9] git_config_set: simplify the way the section name is remembered Johannes Schindelin
2018-03-29 15:19 ` [PATCH 7/9] git config --unset: remove empty sections (in normal situations) Johannes Schindelin
2018-03-29 21:32 ` Jeff King
2018-03-30 13:00 ` Johannes Schindelin
2018-03-30 13:09 ` Jeff King
2018-03-29 15:19 ` [PATCH 8/9] git_config_set: use do_config_from_file() directly Johannes Schindelin
2018-03-29 21:38 ` Jeff King
2018-03-30 13:02 ` Johannes Schindelin
2018-03-30 13:14 ` Jeff King
2018-03-30 14:01 ` Johannes Schindelin
2018-03-30 14:08 ` Jeff King
2018-03-30 19:04 ` Johannes Schindelin
2018-03-29 15:19 ` [PATCH 9/9] git_config_set: reuse empty sections Johannes Schindelin
2018-03-29 21:50 ` Jeff King
2018-03-30 13:15 ` Johannes Schindelin
2018-03-29 17:58 ` [PATCH 0/9] Assorted fixes for `git config` (including the "empty sections" bug) Stefan Beller
2018-03-30 12:14 ` Johannes Schindelin
2018-03-29 19:39 ` Jeff King
2018-03-30 12:35 ` Johannes Schindelin
2018-03-30 14:17 ` Ævar Arnfjörð Bjarmason
2018-03-30 18:46 ` Johannes Schindelin
2018-04-03 16:27 ` [PATCH v2 00/15] " Johannes Schindelin
2018-04-03 16:28 ` [PATCH v2 01/15] git_config_set: fix off-by-two Johannes Schindelin
2018-04-03 16:28 ` [PATCH v2 02/15] t1300: rename it to reflect that `repo-config` was deprecated Johannes Schindelin
2018-04-03 16:28 ` [PATCH v2 03/15] t1300: demonstrate that --replace-all can "invent" newlines Johannes Schindelin
2018-04-03 16:28 ` [PATCH v2 04/15] config --replace-all: avoid extra line breaks Johannes Schindelin
2018-04-03 16:28 ` [PATCH v2 05/15] t1300: avoid relying on a bug Johannes Schindelin
2018-04-03 16:28 ` [PATCH v2 06/15] t1300: remove unreasonable expectation from TODO Johannes Schindelin
2018-04-03 16:28 ` [PATCH v2 07/15] t1300: `--unset-all` can leave an empty section behind (bug) Johannes Schindelin
2018-04-03 16:28 ` [PATCH v2 08/15] config: introduce an optional event stream while parsing Johannes Schindelin
2018-04-06 21:22 ` Jeff King
2018-04-09 7:35 ` Johannes Schindelin
2018-04-03 16:28 ` [PATCH v2 09/15] config: avoid using the global variable `store` Johannes Schindelin
2018-04-06 21:23 ` Jeff King
2018-04-09 7:36 ` Johannes Schindelin
2018-04-03 16:28 ` [PATCH v2 10/15] config_set_store: rename some fields for consistency Johannes Schindelin
2018-04-03 16:28 ` [PATCH v2 11/15] git_config_set: do not use a state machine Johannes Schindelin
2018-04-06 21:28 ` Jeff King
2018-04-09 7:50 ` Johannes Schindelin
2018-04-03 16:28 ` [PATCH v2 12/15] git_config_set: make use of the config parser's event stream Johannes Schindelin
2018-04-03 16:28 ` [PATCH v2 13/15] git config --unset: remove empty sections (in the common case) Johannes Schindelin
2018-04-03 16:29 ` Johannes Schindelin [this message]
2018-04-03 16:30 ` [PATCH v2 00/15] Assorted fixes for `git config` (including the "empty sections" bug) Johannes Schindelin
2018-04-06 21:33 ` Jeff King
2018-04-09 8:19 ` Johannes Schindelin
2018-04-09 8:31 ` [PATCH v3 " Johannes Schindelin
2018-04-09 8:31 ` [PATCH v3 01/15] git_config_set: fix off-by-two Johannes Schindelin
2018-04-09 8:31 ` [PATCH v3 02/15] t1300: rename it to reflect that `repo-config` was deprecated Johannes Schindelin
2018-04-09 8:31 ` [PATCH v3 03/15] t1300: demonstrate that --replace-all can "invent" newlines Johannes Schindelin
2018-04-09 8:31 ` [PATCH v3 04/15] config --replace-all: avoid extra line breaks Johannes Schindelin
2018-04-09 8:31 ` [PATCH v3 05/15] t1300: avoid relying on a bug Johannes Schindelin
2018-04-09 8:31 ` [PATCH v3 06/15] t1300: remove unreasonable expectation from TODO Johannes Schindelin
2018-04-09 8:31 ` [PATCH v3 07/15] t1300: add a few more hairy examples of sections becoming empty Johannes Schindelin
2018-04-09 8:32 ` [PATCH v3 08/15] t1300: `--unset-all` can leave an empty section behind (bug) Johannes Schindelin
2018-04-09 8:32 ` [PATCH v3 09/15] config: introduce an optional event stream while parsing Johannes Schindelin
2018-04-09 8:32 ` [PATCH v3 10/15] config: avoid using the global variable `store` Johannes Schindelin
2018-04-09 8:32 ` [PATCH v3 11/15] config_set_store: rename some fields for consistency Johannes Schindelin
2018-04-09 8:32 ` [PATCH v3 12/15] git_config_set: do not use a state machine Johannes Schindelin
2018-04-09 8:32 ` [PATCH v3 13/15] git_config_set: make use of the config parser's event stream Johannes Schindelin
2018-05-08 13:42 ` Jeff King
2018-05-08 14:00 ` Jeff King
2018-04-09 8:32 ` [PATCH v3 14/15] git config --unset: remove empty sections (in the common case) Johannes Schindelin
2018-04-09 8:32 ` [PATCH v3 15/15] git_config_set: reuse empty sections Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=000be096b9a3ece6374ca5d0bf5eb3c2a872bf2f.1522772789.git.johannes.schindelin@gmx.de \
--to=johannes.schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=haacked@gmail.com \
--cc=jfrey@redhat.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
--cc=sbeller@google.com \
--cc=tr@thomasrast.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).