git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] fetch: handle overlaping refspecs on --prune

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 27, 2014, 20:41 UTC
Message-ID
<xmqqbnxsxp8u.fsf@gitster.dls.corp.google.com>
In-Reply-To
<xmqqob1sxq8v.fsf@gitster.dls.corp.google.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 29 quoted lines
> Carlos Martín Nieto <cmn@elego.de> writes:
>
>> From: Carlos Martín Nieto <cmn@dwim.me>
>>
>> We need to consider that a remote-tracking branch may match more than
>> one rhs of a fetch refspec.
>
> Hmph, do we *need* to, really?
>
> Do you mean fetching one ref on the remote side and storing that in
> multiple remote-tracking refs on our side?  What benefit does such
> an arrangement give the user?  When we "git fetch $there $that_ref"
> to obtain that single ref, do we update both remote-tracking refs?
> When the user asks "git log $that_ref@{upstream}", which one of two
> or more remote-tracking refs should we consult?  Should we report
> an error if these remote-tracking refs that are supposed to track
> the same remote ref not all match?  Does "git push $there $that_ref"
> to update that remote ref update all of these remote-tracking refs
> on our side?  Should it?
>
> My knee-jerk reaction is that it may not be worth supporting such an
> arrangement as broken (we may even want to diagnose it as an error),
> but assuming we do need to, the approach to solve it, i.e. this...
>
>> In such a case, it is not enough to stop at
>> the first match but look at all of the matches in order to determine
>> whether a head is stale.
>
> ... sounds sensible.

Having said that, if we need to support such a configuration, I would not be surprised if there are many other corner case bugs coming from the same root cause---query_refspecs() does not allow us to see more than one destination. It would be prudent to squash them before we officially say we do support such a configuration.

Thanks.
Previous: Junio C HamanoNext: Carlos Martín Nieto
Message 6 of 11 in “fetch: add a failing test for prunning with overlapping refspecs”
  1. 1/2 fetch: add a failing test for prunning with overlapping refspecsCarlos Martín Nieto, Feb 27, 2014
  2. 2/2 fetch: handle overlaping refspecs on --pruneCarlos Martín Nieto, Feb 27, 2014
  3. Michael HaggertyFeb 27, 2014
  4. Carlos Martín NietoFeb 27, 2014
  5. Junio C HamanoFeb 27, 2014
  6. Junio C HamanoFeb 27, 2014
  7. Carlos Martín NietoFeb 28, 2014
  8. Junio C HamanoFeb 28, 2014
  9. Junio C HamanoMar 24, 2014
  10. Eric SunshineFeb 27, 2014
  11. Eric SunshineFeb 27, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.