From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
"Robin H. Johnson" <robbat2@gentoo.org>,
"Git Mailing List" <git@vger.kernel.org>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: git-clone --config order & fetching extra refs during initial clone
Date: Mon, 8 May 2017 22:10:28 -0400 [thread overview]
Message-ID: <20170509021028.fr5mc76kcbpnn4zs@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqq4lwu7r0s.fsf@gitster.mtv.corp.google.com>
On Tue, May 09, 2017 at 10:33:39AM +0900, Junio C Hamano wrote:
> >> My patch deals with 'remote.<name>.refspec', i.e. 'remote->fetch'.
> >> Apparently some extra care is necessary for 'remote.<name>.tagOpt' and
> >> 'remote->fetch_tags', too. Perhaps there are more, I haven't checked
> >> again, and maybe we'll add similar config variables in the future. So
> >> I don't think that dealing with such config variables one by one in
> >> 'git clone', too, is the right long-term solution... but perhaps it's
> >> sufficient for the time being?
> >
> > I think your patch is a strict improvement and we don't need to hold up
> > waiting for a perfect fix (and because of the --single-branch thing you
> > mentioned, this may be the best we can do anyway).
>
> OK, so where does this patch stand now? It already is too late for
> the upcoming release, but should we merge it to 'next' once the
> release is made, cook it in 'next' and shoot for the next release
> as-is, or do we want to allow minor tweaks before it hits 'next'?
I'd be OK with it as-is, but here are my nitpicks as a diff (keep the
assignment of refspec_count in one place, and free fetch_patterns as
soon as it is no longer used).
I actually think it might be nice to pull the whole thing out into its
own function, but the parameters it takes would be oddly specific.
diff --git a/builtin/clone.c b/builtin/clone.c
index 0630202c8..577529a11 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -861,7 +861,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
int err = 0, complete_refs_before_fetch = 1;
struct refspec *refspec;
- unsigned int refspec_count = 1;
+ unsigned int refspec_count;
const char **fetch_patterns;
const struct string_list *config_fetch_patterns;
@@ -994,6 +994,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
config_fetch_patterns = git_config_get_value_multi(key.buf);
if (config_fetch_patterns)
refspec_count = 1 + config_fetch_patterns->nr;
+ else
+ refspec_count = 1;
fetch_patterns = xcalloc(refspec_count, sizeof(*fetch_patterns));
fetch_patterns[0] = value.buf;
if (config_fetch_patterns) {
@@ -1003,6 +1005,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
fetch_patterns[i++] = fp->string;
}
refspec = parse_fetch_refspec(refspec_count, fetch_patterns);
+ free(fetch_patterns);
strbuf_reset(&key);
strbuf_reset(&value);
@@ -1129,7 +1132,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
strbuf_release(&value);
junk_mode = JUNK_LEAVE_ALL;
- free(fetch_patterns);
free(refspec);
return err;
}
-Peff
next prev parent reply other threads:[~2017-05-09 2:10 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-25 19:12 git-clone --config order & fetching extra refs during initial clone Robin H. Johnson
2017-02-25 20:21 ` Jeff King
2017-02-25 20:50 ` Jeff King
2017-02-27 19:16 ` Junio C Hamano
2017-02-27 21:12 ` Jeff King
2017-03-11 0:41 ` SZEDER Gábor
2017-03-15 17:08 ` Jeff King
2017-05-03 14:42 ` SZEDER Gábor
2017-05-03 20:22 ` Jeff King
2017-05-04 6:57 ` Sebastian Schuberth
2017-05-09 1:33 ` Junio C Hamano
2017-05-09 2:10 ` Jeff King [this message]
2017-05-09 2:26 ` Jeff King
2017-05-09 2:50 ` Junio C Hamano
2017-05-04 7:28 ` Ævar Arnfjörð Bjarmason
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=20170509021028.fr5mc76kcbpnn4zs@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=robbat2@gentoo.org \
--cc=szeder.dev@gmail.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).