Re: [PATCH v10 2/5] fetch: extract collect_upstream_from_remote() helper
Show 15 quoted lines
> > When a fetch has no refspec to work from, we fall back to guessing
> > what to fetch: the remote's configured fetch refspec if there is one,
> > and separately, whether the current branch's upstream lives on this
> > remote.
>
> It took me a couple tries to parse this because the 2 halves ("[one],
> and separately, [two]") are 2 different kinds of objects! I think what
> you are trying to tell me is
>
> …we fall back to guessing what to fetch: the remote's …
> separately, the current branch's upstream if it lives on the fetched
> remote.
>
> That way [two] is also a "thing to fetch" in the same class of objects
> as [one]? Or have I misunderstood?Show 32 quoted lines
> > The latter is independent of the former on purpose: a narrow
> > refspec (for example from "git remote add -t") can leave the current
> > branch's own upstream uncovered, and we still need to be able to fetch
> > it.
>
> I don't really understand the meaning here. I can guess that you mean
> something like "A remote with a narrow refspec, like what you get from
> 'git remote add -t', can omit a branch's upstream from the remote's
> fetch refspec, and we still want to fetch that upstream." But it's
> taken me a while to put that together (after puzzling out the above)
> after first not knowing what "uncovered" meant.
>
> I think the whole thing would be clearer with an example:
>
> """
> Imagine a remote with a narrow refspec:
>
> git remote add -t main colleague <remote>
>
> and a branch whose upstream points at that remote, but isn't part of
> the remote's refspec:
>
> git fetch colleague work:refs/remotes/colleague/work
> git switch -c work colleague/work
>
> When we "git fetch colleague" without a refspec, we decide what to
> fetch by combining the remote's refspec (main -> remote-tracking
> branch, in this case) and the current branch's upstream, if it was
> based on that remote (work -> remote-tracking branch, in this case).
> """
>
> Note: we aren't "guessing" what to fetch!
Thanks! Maybe this should be the example instead?
git clone --single-branch <url>
git switch -c work
git push -u origin workShow 7 quoted lines
> I'm not sure if we have guidance about where in the parameter list
> "out" parameters should go, but I would expect them to be last? Idk.
>
> Should the "inputs" be const to better communicate that we aren't
> going to modify them? I'm not really sure of the const semantics of C
> anyway, and I know there have been topics in the recent past around
> const-modifier lints and so on.
Show 25 quoted lines
> > +{
> > + struct branch *branch = repo_branch_get(repo, refname);
> > +
> > + if (!branch_has_merge_config(branch) ||
> > + strcmp(branch->remote_name, remote->name))
> > + return;
> > +
> > + for (int i = 0; i < branch->merge_nr; i++)
> > + string_list_insert(tracked, branch->merge[i]->src);
> > +}
>
> We do trade some performance now, right? We first collect a
> string_list, then push them into a strvec, which has some overhead
> relative to skipping the intermediate step. Plus, string_lists sort,
> which the original didn't do. And the caller uses the DUP version of
> string_list (and IIUC strvec_push strdup's as well), so we end up
> copying twice?
>
> If we used a strvec instead, we could use strvec_pushv, perhaps, being
> a bit more efficient? (It would be nice if we had an ownership-taking
> strvec_appendv or something?)
>
> But stepping back, if the caller just provides a strvec instead of a
> string_list, we can push to it directly, since that's what happens
> anyway! We don't do any filtering or anything in the new caller.Yes, I'll handle this.
Harald