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 8/9] git_config_set: use do_config_from_file() directly
Date: Thu, 29 Mar 2018 17:19:04 +0200 (DST) [thread overview]
Message-ID: <e3032300946eb5962878341f7796f5872c4d138d.1522336130.git.johannes.schindelin@gmx.de> (raw)
In-Reply-To: <cover.1522336130.git.johannes.schindelin@gmx.de>
Technically, it is the git_config_set_multivar_in_file_gently()
function that we modify here (but the oneline would get too long if we
were that precise).
This change prepares the git_config_set machinery to allow reusing empty
sections, by using the file-local function do_config_from_file()
directly (whose signature can then be changed without any effect outside
of config.c).
An incidental benefit is that we avoid a level of indirection, and we
also avoid calling flockfile()/funlockfile() when we already know that
we are not operating on stdin/stdout here.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
config.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/config.c b/config.c
index 503aef4b318..eb1e0d335fc 100644
--- a/config.c
+++ b/config.c
@@ -2706,6 +2706,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
struct stat st;
size_t copy_begin, copy_end;
int i, new_line = 0;
+ FILE *f;
if (value_regex == NULL)
store.value_regex = NULL;
@@ -2739,7 +2740,10 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
* As a side effect, we make sure to transform only a valid
* existing config file.
*/
- if (git_config_from_file(store_aux, config_filename, NULL)) {
+ f = fopen_or_warn(config_filename, "r");
+ if (!f || do_config_from_file(store_aux, CONFIG_ORIGIN_FILE,
+ config_filename, config_filename,
+ f, NULL)) {
error("invalid config file %s", config_filename);
if (store.value_regex != NULL &&
store.value_regex != CONFIG_REGEX_NONE) {
@@ -2747,8 +2751,11 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
free(store.value_regex);
}
ret = CONFIG_INVALID_FILE;
+ if (f)
+ fclose(f);
goto out_free;
- }
+ } else
+ fclose(f);
if (store.value_regex != NULL &&
store.value_regex != CONFIG_REGEX_NONE) {
--
2.16.2.windows.1.26.g2cc3565eb4b
next prev parent reply other threads:[~2018-03-29 15:19 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 ` Johannes Schindelin [this message]
2018-03-29 21:38 ` [PATCH 8/9] git_config_set: use do_config_from_file() directly 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 ` [PATCH v2 14/15] git_config_set: reuse empty sections Johannes Schindelin
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=e3032300946eb5962878341f7796f5872c4d138d.1522336130.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).