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

Re: Q: how can i find the upstream merge point of a commit?

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 15, 2011, 23:53 UTC
Message-ID
<7vips6ircc.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110615230033.GB19803@sigill.intra.peff.net>
Jeff King <peff@github.com> writes:
Show 9 quoted lines
> Given 1/2/3, you would look for tags in:
>
>   refs/remotes/1/tags/2/3
>   refs/remotes/1/2/tags/3
>
> and then similarly heads in:
>
>   refs/remotes/1/heads/2/3
>   refs/remotes/1/2/heads/3
Show 10 quoted lines
> And then complain of ambiguity if they both match (which will almost
> _never_ happen, unless you have a totally insane repo setup. So this is
> really just about having well-defined rules just in case, and probably
> won't affect most people in practice. In most cases, it will just DWYM).
>
> The "HEAD" thing remains simple. You check for:
>
>   refs/remotes/1/2/3/HEAD
>
> since HEAD is going to be at the top-level anyway.
Gaah, why is this even a good thing?

Yes, you demonstrated that it is _possible_ to define disambiguation rules, but do we currently allow (or horrors encourage) hierarchical remote nicknames, and do people rely on being able to do so? What workflows benefit from such a confusing layout?

I am not fundamentally opposed to it, but just trying to tell between "we do so because we can" and "because we need to for such and such reasons".

Previous: Jeff KingNext: Jeff King
Message 15 of 19 in “Q: how can i find the upstream merge point of a commit?”
  1. Ingo MolnarJun 8, 2011
  2. Johannes SixtJun 8, 2011
  3. Stephen RothwellJun 8, 2011
  4. Peter ZijlstraJun 8, 2011
  5. Stephen RothwellJun 8, 2011
  6. Peter ZijlstraJun 8, 2011
  7. Ingo MolnarJun 8, 2011
  8. Sverre RabbelierJun 8, 2011
  9. Ingo MolnarJun 8, 2011
  10. Nguyen Thai Ngoc DuyJun 8, 2011
  11. Johan HerlandJun 14, 2011
  12. Jeff KingJun 14, 2011
  13. Johan HerlandJun 14, 2011
  14. Jeff KingJun 15, 2011
  15. Junio C HamanoJun 15, 2011
  16. Jeff KingJun 16, 2011
  17. Jakub NarebskiJun 16, 2011
  18. Junio C HamanoJun 8, 2011
  19. Ingo MolnarJun 8, 2011

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.