From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: [PATCH 4/5] config: initialize origin_type correctly
Date: Fri, 2 Jul 2021 05:05:05 -0500 [thread overview]
Message-ID: <20210702100506.1422429-5-felipe.contreras@gmail.com> (raw)
In-Reply-To: <20210702100506.1422429-1-felipe.contreras@gmail.com>
cf->origin_type either is CONFIG_ORIGIN_CMDLINE, or it's something else.
Don't override that.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
config.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/config.c b/config.c
index 9172c96c54..666fb2c689 100644
--- a/config.c
+++ b/config.c
@@ -2087,13 +2087,12 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha
if (cf->name) {
kv_info->filename = strintern(cf->name);
kv_info->linenr = cf->linenr;
- kv_info->origin_type = cf->origin_type;
} else {
/* for values read from `git_config_from_parameters()` */
kv_info->filename = NULL;
kv_info->linenr = -1;
- kv_info->origin_type = CONFIG_ORIGIN_CMDLINE;
}
+ kv_info->origin_type = cf->origin_type;
kv_info->scope = current_parsing_scope;
si->util = kv_info;
--
2.32.0.94.g4574ca548c
next prev parent reply other threads:[~2021-07-02 10:05 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-02 10:05 [PATCH 0/5] Default aliases Felipe Contreras
2021-07-02 10:05 ` [PATCH 1/5] test: add missing whitespaces Felipe Contreras
2021-07-02 10:05 ` [PATCH 2/5] config: trivial style fix Felipe Contreras
2021-07-02 10:05 ` [PATCH 3/5] config: trivial struct initialization cleanup Felipe Contreras
2021-07-02 10:05 ` Felipe Contreras [this message]
2021-07-02 10:05 ` [PATCH 5/5] config: add default aliases Felipe Contreras
2021-07-02 10:10 ` Andreas Schwab
2021-07-02 10:17 ` Felipe Contreras
2021-07-02 10:31 ` Andreas Schwab
2021-07-02 10:46 ` Felipe Contreras
2021-07-02 10:54 ` Andreas Schwab
2021-07-02 10:44 ` martin
2021-07-02 10:54 ` Felipe Contreras
2021-07-02 11:15 ` martin
2021-07-02 13:26 ` Randall S. Becker
2021-07-02 13:41 ` Ævar Arnfjörð Bjarmason
2021-07-02 14:15 ` Randall S. Becker
2021-07-02 14:43 ` martin
2021-07-02 20:44 ` Felipe Contreras
2021-07-02 22:03 ` Randall S. Becker
2021-07-02 22:32 ` Felipe Contreras
2021-07-02 15:39 ` Junio C Hamano
2021-07-02 20:41 ` Felipe Contreras
2021-07-02 21:02 ` Felipe Contreras
2021-07-02 21:40 ` martin
2021-07-02 22:16 ` Felipe Contreras
2021-07-02 22:00 ` Randall S. Becker
2021-07-02 22:31 ` Felipe Contreras
2021-07-02 21:12 ` Felipe Contreras
2021-07-02 21:31 ` martin
2021-07-02 22:14 ` Felipe Contreras
2021-07-02 11:32 ` Ævar Arnfjörð Bjarmason
2021-07-02 21:58 ` Felipe Contreras
2021-07-02 22:38 ` martin
2021-07-02 23:48 ` Felipe Contreras
2021-07-05 14:02 ` Randall S. Becker
2021-07-06 15:27 ` Randall S. Becker
2021-07-06 21:59 ` Felipe Contreras
2021-07-10 15:30 ` Philip Oakley
2021-07-03 10:50 ` Jeff King
2021-07-06 21:54 ` Felipe Contreras
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=20210702100506.1422429-5-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).