From: Tom Saeger <tom.saeger@oracle.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Derrick Stolee <stolee@gmail.com>, git@vger.kernel.org
Subject: Re: should git maintenance prefetch be taught to honor remote.fetch refspec?
Date: Mon, 5 Apr 2021 15:38:32 -0500 [thread overview]
Message-ID: <20210405203832.x275fqoinfsw5gik@dhcp-10-154-153-195.vpn.oracle.com> (raw)
In-Reply-To: <xmqqr1jo5zzb.fsf@gitster.g>
On Mon, Apr 05, 2021 at 11:48:56AM -0700, Junio C Hamano wrote:
> Derrick Stolee <stolee@gmail.com> writes:
>
> > ... but it becomes difficult
> > when we intend to make a distinction between "refs/heads/" and
> > other sub-areas within "refs/". Finally, I punted on that
> > conversion and made the logic in 'prefetch' extremely obvious:
> >
> > 1. If the refspec's 'dst' starts with "refs/", then replace
> > that prefix with "refs/prefetch/".
> >
> > 2. If the refspec's 'dst' does not start with "refs/", then
> > concatenate "refs/prefetch/" and 'dst'.
> >
> > This will keep a roughly-equivalent partition of refs (some
> > might have previously collided that will not any more).
>
> Makes sense. Do we need to add another rule?
>
> 3. If the refspec does not have 'dst', ignore it.
I just tried what I think you're saying here.
Consider this fetch config:
$ 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
$ git fetch pr-924
Fetching pr-924
From https://github.com/gitgitgadget/git
* tag pr-924/derrickstolee/maintenance/refspec-v1 -> FETCH_HEAD
Prefetch segfaults
$ git maintenance run --task prefetch
[1] 3811315 segmentation fault (core dumped) git maintenance run --task prefetch
refspec which isn't a 'negative' with a src, but no dst.
Quick hack:
diff --git a/builtin/gc.c b/builtin/gc.c
index 92cb8b4e0bfa..2f4b8f2375c3 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -899,6 +899,10 @@ static int fetch_remote(struct remote *remote, void *cbdata)
continue;
}
+ if (!rsi->dst) {
+ continue;
+ }
+
refspec_item_init(&replace, remote->fetch.raw[i], 1);
/*
Better, but now a different issue:
$ git maintenance run --task prefetch
fatal: --refmap option is only meaningful with command-line refspec(s).
error: failed to prefetch remotes
error: task 'prefetch' failed
So a "remote" where the only fetch url is skipped.
>
> > I have posted my patch series [1], so please take a look. It
> > builds up the infrastructure to properly test such a refspec
> > expansion, if we wish to do so.
> >
> > [1] https://lore.kernel.org/git/pull.924.git.1617627856.gitgitgadget@gmail.com/
> >
> > Thanks,
> > -Stolee
>
> Thanks.
next prev parent reply other threads:[~2021-04-05 20:38 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 [this message]
2021-04-05 20:47 ` Junio C Hamano
2021-04-05 20:49 ` Derrick Stolee
2021-04-05 20:50 ` Tom Saeger
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=20210405203832.x275fqoinfsw5gik@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).