From: Derrick Stolee <stolee@gmail.com>
To: Sean Barag via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
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 15:13:04 -0400 [thread overview]
Message-ID: <0739858e-83f1-3b3f-aba0-7549e7e47cfc@gmail.com> (raw)
In-Reply-To: <5c519376c29a28bd89a712cf0b8125fc1c2c81be.1599848727.git.gitgitgadget@gmail.com>
On 9/11/2020 2:25 PM, Sean Barag via GitGitGadget wrote:
> static char *option_origin = NULL;
> +static char *remote_name = "origin";
This patch could have used a prep patch that had all consumers
of option_origin use remote_name instead, with this adjustment
to the way to use option_origin:
> - if (!option_origin)
> - option_origin = "origin";
> + if (option_origin)
> + remote_name = option_origin;
> + else
> + remote_name = "origin";
Then this patch introducing the config option would have a
very limited change in the builtin consisting of these two
hunks:
> 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);
> }
...
> if (option_origin)
> remote_name = option_origin;
> - else
> - remote_name = "origin"
along with this translators comment note:
> if (!valid_fetch_refspec(resolved_refspec.buf))
> - /* TRANSLATORS: %s will be the user-provided --origin / -o option */
> - die(_("'%s' is not a valid origin name"), option_origin);
> + /*
> + * TRANSLATORS: %s will be the user-provided --origin / -o option, or the value
> + * of clone.defaultremotename from the config.
> + */
> + die(_("'%s' is not a valid origin name"), remote_name);
> --- a/t/t5606-clone-options.sh
> +++ b/t/t5606-clone-options.sh
> @@ -43,13 +43,6 @@ test_expect_success 'disallows --bare with --separate-git-dir' '
>
> '
>
> -test_expect_success 'uses "origin" for default remote name' '
> -
> - git clone parent clone-default-origin &&
> - (cd clone-default-origin && git rev-parse --verify refs/remotes/origin/master)
> -
> -'
> -
Interesting that you moved this test. Probably not necessary, and
just a mistake.
> test_expect_success 'prefers --template config over normal config' '
>
> template="$TRASH_DIRECTORY/template-with-config" &&
> @@ -71,6 +64,28 @@ test_expect_success 'prefers -c config over --template config' '
>
> '
>
> +test_expect_success 'uses "origin" for default remote name' '
> +
> + git clone parent clone-default-origin &&
> + (cd clone-default-origin && git rev-parse --verify refs/remotes/origin/master)
I didn't notice it earlier, but perhaps this subshell should be split
into its own multi-line section as follows:
> + (
> + cd clone-default-origin &&
> + git rev-parse --verify refs/remotes/origin/master
> + )
But even better, this is only one line so using
"git -C clone-default-origin rev-parse" is simpler:
> +test_expect_success 'uses "origin" for default remote name' '
> +
> + git clone parent clone-default-origin &&
> + git -C clone-default-origin rev-parse --verify refs/remotes/origin/master
> +'
> +test_expect_success 'prefers config "clone.defaultRemoteName" over default' '
> +
> + test_config_global clone.defaultRemoteName from_config &&
> + git clone parent clone-config-origin &&
This could be done using "git -c clone.defaultRemoteName=from_config" instead
of setting the global config.
> + (cd clone-config-origin && git rev-parse --verify refs/remotes/from_config/master)
> +
> +'
> +
> +test_expect_success 'prefers --origin over -c config' '
> +
> + git clone -c clone.defaultRemoteName=inline --origin from_option parent clone-o-and-inline-config &&
And you use the -c option here.
> + (cd clone-o-and-inline-config && git rev-parse --verify refs/remotes/from_option/master)
> +
> +'
> +
We have the extra newline in these tests, too.
Thanks,
-Stolee
next prev parent reply other threads:[~2020-09-11 19:13 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 [this message]
2020-09-28 16:04 ` Sean Barag
2020-09-11 21:00 ` Junio C Hamano
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=0739858e-83f1-3b3f-aba0-7549e7e47cfc@gmail.com \
--to=stolee@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.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).