From: Tom Saeger <tom.saeger@oracle.com>
To: Derrick Stolee <stolee@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: should git maintenance prefetch be taught to honor remote.fetch refspec?
Date: Mon, 5 Apr 2021 15:50:56 -0500 [thread overview]
Message-ID: <20210405205056.czzkjdxr3guca3mf@dhcp-10-154-153-195.vpn.oracle.com> (raw)
In-Reply-To: <5c432329-1e42-c29c-242d-a2955174296b@gmail.com>
On Mon, Apr 05, 2021 at 04:49:29PM -0400, Derrick Stolee wrote:
> On 4/5/2021 4:47 PM, Junio C Hamano wrote:
> > Tom Saeger <tom.saeger@oracle.com> writes:
> >
> >> $ git config --local --get-regexp "pr-924"
> >> remote.pr-924.url https://github.com/gitgitgadget/git
> >> remote.pr-924.fetch +refs/tags/pr-924/derrickstolee/maintenance/refspec-v1
> >>
> >> Seems legal, fetch even works
> >
> > Yes. For a ref that is one-shot use (like PR tags), this does not
> > make much sense, but
> >
> > [remote "submaintainer1"]
> > url = ... repository of submaintainer #1 ...
> > fetch = master
> > tagopts = --no-tags
> >
> > is a reasonable thing to have for those who regularly work with
> > submaintainer(s) of their project. They'd do
> >
> > $ git pull submaintainer1
> >
> > to accept the work their submaintainers have done.
>
> Thanks for the extra testing! I'll be sure to fix this bug in v2.
>
> -Stolee
>
Hacked this:
diff --git a/builtin/gc.c b/builtin/gc.c
index 92cb8b4e0bfa..8c0fcbd3bb7e 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -879,6 +879,7 @@ static int fetch_remote(struct remote *remote, void *cbdata)
struct maintenance_run_opts *opts = cbdata;
struct child_process child = CHILD_PROCESS_INIT;
int i;
+ int nargs;
child.git_cmd = 1;
strvec_pushl(&child.args, "fetch", remote->name, "--prune", "--no-tags",
@@ -888,6 +889,8 @@ static int fetch_remote(struct remote *remote, void *cbdata)
if (opts->quiet)
strvec_push(&child.args, "--quiet");
+ nargs = child.args.nr;
+
for (i = 0; i < remote->fetch.nr; i++) {
struct refspec_item replace;
struct refspec_item *rsi = &remote->fetch.items[i];
@@ -899,6 +902,10 @@ static int fetch_remote(struct remote *remote, void *cbdata)
continue;
}
+ if (!rsi->dst) {
+ continue;
+ }
+
refspec_item_init(&replace, remote->fetch.raw[i], 1);
/*
@@ -920,6 +927,10 @@ static int fetch_remote(struct remote *remote, void *cbdata)
refspec_item_clear(&replace);
}
+ /* skip remote if no refspecs to fetch */
+ if (child.args.nr <= nargs)
+ return 0;
+
return !!run_command(&child);
}
next prev parent reply other threads:[~2021-04-05 20:51 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 18:49 should git maintenance prefetch be taught to honor remote.fetch refspec? Tom Saeger
2021-04-01 19:07 ` Derrick Stolee
2021-04-01 19:42 ` Tom Saeger
2021-04-01 20:14 ` Junio C Hamano
2021-04-01 22:11 ` Tom Saeger
2021-04-01 22:25 ` Derrick Stolee
2021-04-02 18:27 ` Tom Saeger
2021-04-02 20:43 ` Derrick Stolee
2021-04-02 21:07 ` Derrick Stolee
2021-04-02 21:39 ` Tom Saeger
2021-04-02 22:09 ` Junio C Hamano
2021-04-02 22:27 ` Tom Saeger
2021-04-02 21:15 ` Tom Saeger
2021-04-02 21:19 ` Junio C Hamano
2021-04-02 21:33 ` Tom Saeger
2021-04-04 20:25 ` Derrick Stolee
2021-04-04 23:10 ` Junio C Hamano
2021-04-05 13:20 ` Derrick Stolee
2021-04-05 18:48 ` Junio C Hamano
2021-04-05 20:38 ` Tom Saeger
2021-04-05 20:47 ` Junio C Hamano
2021-04-05 20:49 ` Derrick Stolee
2021-04-05 20:50 ` Tom Saeger [this message]
2021-04-05 20:54 ` Derrick Stolee
2021-04-02 22:32 ` Eric Sunshine
2021-04-03 20:21 ` Tom Saeger
2021-04-03 22:41 ` 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=20210405205056.czzkjdxr3guca3mf@dhcp-10-154-153-195.vpn.oracle.com \
--to=tom.saeger@oracle.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=stolee@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).