From: Junio C Hamano <gitster@pobox.com>
To: "Sean Barag via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Sean Barag <sean@barag.org>
Subject: Re: [PATCH 4/4] clone: allow configurable default for `-o`/`--origin`
Date: Fri, 11 Sep 2020 14:00:16 -0700 [thread overview]
Message-ID: <xmqqwo10m3kv.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <5c519376c29a28bd89a712cf0b8125fc1c2c81be.1599848727.git.gitgitgadget@gmail.com> (Sean Barag via GitGitGadget's message of "Fri, 11 Sep 2020 18:25:27 +0000")
"Sean Barag via GitGitGadget" <gitgitgadget@gmail.com> writes:
> diff --git a/builtin/clone.c b/builtin/clone.c
> index 1cd62d0001..aeb41f15f3 100644
> --- a/builtin/clone.c
> +++ b/builtin/clone.c
> @@ -53,6 +53,7 @@ static int option_shallow_submodules;
> static int deepen;
> static char *option_template, *option_depth, *option_since;
> static char *option_origin = NULL;
> +static char *remote_name = "origin";
This has a side effect of making all the code locations that used to
refer to option_origin much easier to read, like ...
> @@ -721,7 +722,7 @@ static void update_head(const struct ref *our, const struct ref *remote,
> if (!option_bare) {
> update_ref(msg, "HEAD", &our->old_oid, NULL, 0,
> UPDATE_REFS_DIE_ON_ERR);
> - install_branch_config(0, head, option_origin, our->name);
> + install_branch_config(0, head, remote_name, our->name);
... this place ;-) Happy.
> static int git_clone_config(const char *k, const char *v, void *cb)
> {
> + if (!strcmp(k, "clone.defaultremotename") && !option_origin)
> + remote_name = xstrdup(v);
> return git_default_config(k, v, cb);
> }
clone.defaultremotename is a single valued configuration variable,
and this correctly implements the "last one wins" behaviour (but
previous remote_name will leak every time clone.defaultremotename
is seen in the config stream).
Also this code arrangement is not quite satisfactory. It means that
we cannot re-read any configuration variable that does not have an
accompanying command line option. I thought the whole point of
doing the write_config() was so that anything came from the command
line option can be written back to the configuration file, so I am
not sure what the harm would be to update remote_name from the
configuration whether option_origin is used or not here. Perhaps
add "clone.defaultremotename" to the set of configuration setting
write_config() uses, when --option is given from the command line,
and remove this special case?
By the way, I now realized why 2/4's "read twice" is OK. init_db()
calls create_default_files() and we do clare the cached configset by
calling git_config_clear() there.
Thanks.
next prev parent reply other threads:[~2020-09-11 21:00 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-11 18:25 [PATCH 0/4] clone: allow configurable default for -o/--origin Sean Barag via GitGitGadget
2020-09-11 18:25 ` [PATCH 1/4] clone: add tests for --template and some disallowed option pairs Sean Barag via GitGitGadget
2020-09-11 18:57 ` Derrick Stolee
2020-09-11 19:56 ` Jeff King
2020-09-11 20:07 ` Eric Sunshine
2020-09-16 3:15 ` [PATCH 0/4] clone: allow configurable default for -o/--origin Sean Barag
2020-09-12 3:17 ` [PATCH 1/4] clone: add tests for --template and some disallowed option pairs Taylor Blau
2020-09-15 16:09 ` Sean Barag
2020-09-16 16:36 ` Jeff King
2020-09-11 21:02 ` Junio C Hamano
2020-09-12 0:41 ` Derrick Stolee
2020-09-11 18:25 ` [PATCH 2/4] clone: call git_config before parse_options Sean Barag via GitGitGadget
2020-09-11 18:59 ` Derrick Stolee
2020-09-11 20:26 ` Junio C Hamano
2020-09-16 16:12 ` Sean Barag
2020-09-11 18:25 ` [PATCH 3/4] clone: validate --origin option before use Sean Barag via GitGitGadget
2020-09-11 19:24 ` Derrick Stolee
2020-09-16 16:28 ` Sean Barag
2020-09-11 20:39 ` Junio C Hamano
2020-09-16 17:11 ` Sean Barag
2020-09-21 16:13 ` Sean Barag
2020-09-11 18:25 ` [PATCH 4/4] clone: allow configurable default for `-o`/`--origin` Sean Barag via GitGitGadget
2020-09-11 19:13 ` Derrick Stolee
2020-09-28 16:04 ` Sean Barag
2020-09-11 21:00 ` Junio C Hamano [this message]
2020-09-28 16:02 ` Sean Barag
2020-09-17 15:25 ` Andrei Rybak
2020-09-11 19:25 ` [PATCH 0/4] clone: allow configurable default for -o/--origin Derrick Stolee
2020-09-11 19:34 ` Junio C Hamano
2020-09-29 3:36 ` [PATCH v2 0/7] " Sean Barag via GitGitGadget
2020-09-29 3:36 ` [PATCH v2 1/7] clone: add tests for --template and some disallowed option pairs Sean Barag via GitGitGadget
2020-09-29 3:36 ` [PATCH v2 2/7] clone: use more conventional config/option layering Sean Barag via GitGitGadget
2020-09-29 3:36 ` [PATCH v2 3/7] remote: add tests for add and rename with invalid names Sean Barag via GitGitGadget
2020-09-29 3:36 ` [PATCH v2 4/7] refs: consolidate remote name validation Sean Barag via GitGitGadget
2020-09-29 3:36 ` [PATCH v2 5/7] clone: validate --origin option before use Sean Barag via GitGitGadget
2020-09-29 3:36 ` [PATCH v2 6/7] clone: read new remote name from remote_name instead of option_origin Sean Barag via GitGitGadget
2020-09-29 3:36 ` [PATCH v2 7/7] clone: allow configurable default for `-o`/`--origin` Sean Barag via GitGitGadget
2020-09-29 19:59 ` Junio C Hamano
2020-09-29 23:47 ` [PATCH] clone: add remote.cloneDefault config option Sean Barag
2020-09-29 3:44 ` [PATCH v2 0/7] clone: allow configurable default for -o/--origin Sean Barag
2020-10-01 3:46 ` [PATCH v3 " Sean Barag via GitGitGadget
2020-10-01 3:46 ` [PATCH v3 1/7] clone: add tests for --template and some disallowed option pairs Sean Barag via GitGitGadget
2020-10-01 3:46 ` [PATCH v3 2/7] clone: use more conventional config/option layering Sean Barag via GitGitGadget
2020-10-01 3:46 ` [PATCH v3 3/7] remote: add tests for add and rename with invalid names Sean Barag via GitGitGadget
2020-10-01 3:46 ` [PATCH v3 4/7] refs: consolidate remote name validation Sean Barag via GitGitGadget
2020-10-01 3:46 ` [PATCH v3 5/7] clone: validate --origin option before use Sean Barag via GitGitGadget
2020-10-01 3:46 ` [PATCH v3 6/7] clone: read new remote name from remote_name instead of option_origin Sean Barag via GitGitGadget
2020-10-01 3:46 ` [PATCH v3 7/7] clone: allow configurable default for `-o`/`--origin` Sean Barag via GitGitGadget
2020-10-02 12:56 ` [PATCH v3 0/7] clone: allow configurable default for -o/--origin Derrick Stolee
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=xmqqwo10m3kv.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=johannes.schindelin@gmx.de \
--cc=sean@barag.org \
/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).