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

Re: [PATCH 2/3] refs: do not label special refs as pseudo refs

From
Patrick Steinhardt <ps@pks.im>
Date
Apr 30, 2024, 12:11 UTC
Message-ID
<ZjDf1TIqTTRMqZ1E@tanuki>
In-Reply-To
<e9c70778-3414-48ae-8a7d-6b6f0dfaad63@gmail.com>
On Tue, Apr 30, 2024 at 10:59:36AM +0100, Phillip Wood wrote:
Show 28 quoted lines
> Hi Patrick
> 
> On 30/04/2024 08:30, Patrick Steinhardt wrote:
> > On Mon, Apr 29, 2024 at 04:12:37PM +0100, Phillip Wood wrote:
> > 
> > > This changes the definition to allow pseudorefs to by symbolic refs. When
> > > is_pseudoref() was introduced Junio and I had a brief discussion about this
> > > restriction and he was not in favor of allowing pseudorefs to be symbolic
> > > refs [1].
> > 
> > So the reason why pseudorefs exist is that some refs behave like a ref
> > sometimes, but not always. And in my book that really only applies to
> > MERGE_HEAD and FETCH_HEAD, because those contain additional metadata
> > that makes them not-a-ref. And for those I very much see that they
> > should not ever be a symref.
> > 
> > But everyhing else living in the root of the ref hierarchy is not
> > special in any way, at least not in my opinion. We have never enforced
> > that those cannot be symrefs, and it makes our terminology needlessly
> > confusing.
> 
> I agree HEAD not being a pseudoref and having special refs as well as
> pseudorefs refs is confusing. I do have some sympathy for the argument that
> pseudorefs should not be symbolic refs though as AUTO_MERGE,
> CHERRY_PICK_HEAD, ORIG_HEAD etc. are all pointers to a commit and it would
> be a bug for them to be a symbolic ref. It is unfortunate that in the move
> away from assessing those refs as files we lost the check that they are not
> symbolic refs.

While I agree that conceptually these should always be "regular" refs, I feel like that is higher-level logic that belongs into the respective subsystems that write those. I just don't see why the ref backend should care about the particular usecases that those higher-level subsystems have, and I can very much see that there might eventually be another subsystem that actually wants a specific ref to be a symref.

No we could of course start to hard code all kinds of refs into the ref layer. But I think that this is the wrong way to go, and treating the ref store as just that, a generic store where you can store refs, without attaching specific meaning to any of the refs, is the proper way to go.

Show 27 quoted lines
> > I think I'm going to reroll this patch series and go down the nuclear
> > path that I've hinted at in the cover letter:
> > 
> >    - Pseudo refs can only be either FETCH_HEAD or MERGE_HEAD.
> > 
> >    - Refs starting with "refs/" are just plain normal refs.
> > 
> >    - Refs living in the root of the ref hierarchy need to conform to a
> >      set of strict rules, as Peff is starting to enforce in a separate
> >      patch series. These are just normal refs, as well, even though we
> >      may call them "root ref" in our tooling as they live in the root of
> >      the ref hierarchy.
> 
> That would certainly be simpler.
> 
> > I just don't think that the current state makes sense to anybody. It's
> > majorly confusing -- I've spent the last 8 months working in our refs
> > code almost exclusively and still forget what's what. How are our users
> > expected to understand this?
> 
> The current state is confusing but arguably there is a logic to the various
> distinctions - whether those distinctions are useful in practice is open to
> debate though. I wonder how much users really care about these distinctions
> and whether it affects their use of git. I was unaware of the distinction
> between HEAD and pseudorefs until I reviewed Karthik's for-each-ref series a
> couple of months ago and I don't think that lack of knowledge had caused me
> any trouble when using git.

There is some logic, that's true enough. I just don't think that anybody understands the logic.

Patrick
Show 20 quoted lines
> > > Are there any practical implications of the changes in this patch for users
> > > running commands like "git log FETCH_HEAD" (I can't think of any off the top
> > > of my head but it would be good to have some reassurance on that point in
> > > the commit message)
> > 
> > Not really, no. We have never been doing a good job at enforcing the
> > difference between pseudo refs or normal refs anyway. Pseudo refs can be
> > symrefs just fine, and our tooling won't complain. The only exception
> > where I want us to become stricter is in how we enforce the syntax rules
> > for root refs (which is handled by Peff in a separate patch series), and
> > that we start to not treat FETCH_HEAD and MERGE_HEAD as proper refs.
> > They should still resolve when you ask git-rev-parse(1), but when you
> > iterate through refs they should not be surfaced as they _aren't_ refs.
> 
> That's good
> 
> Thanks
> 
> Phillip
> 
Previous: Phillip WoodNext: Jeff King
Message 7 of 93 in “Clarify pseudo-ref terminology”
  1. 0/3 Clarify pseudo-ref terminologyPatrick Steinhardt, Apr 29, 2024
  2. 1/3 refs: move `is_special_ref()`Patrick Steinhardt, Apr 29, 2024
  3. 2/3 refs: do not label special refs as pseudo refsPatrick Steinhardt, Apr 29, 2024
  4. Phillip WoodApr 29, 2024
  5. Patrick SteinhardtApr 30, 2024
  6. Phillip WoodApr 30, 2024
  7. Patrick SteinhardtApr 30, 2024
  8. Jeff KingApr 30, 2024
  9. Karthik NayakApr 30, 2024
  10. Patrick SteinhardtApr 30, 2024
  11. Patrick SteinhardtApr 30, 2024
  12. Junio C HamanoApr 29, 2024
  13. Justin ToblerApr 29, 2024
  14. Patrick SteinhardtApr 30, 2024
  15. Jean-Noël AVILAMay 9, 2024
  16. Patrick SteinhardtMay 10, 2024
  17. 3/3 refs: fix segfault in `is_pseudoref()` when ref cannot be resolvedPatrick Steinhardt, Apr 29, 2024
  18. Phillip WoodApr 29, 2024
  19. Karthik NayakApr 29, 2024
  20. Phillip WoodApr 29, 2024
  21. Karthik NayakApr 29, 2024
  22. Patrick SteinhardtApr 30, 2024
  23. 00/10 Clarify pseudo-ref terminologyPatrick Steinhardt, Apr 30, 2024
  24. 01/10 Documentation/glossary: redefine pseudorefs as special refsPatrick Steinhardt, Apr 30, 2024
  25. Karthik NayakApr 30, 2024
  26. Justin ToblerApr 30, 2024
  27. Junio C HamanoApr 30, 2024
  28. Patrick SteinhardtMay 2, 2024
  29. 02/10 Documentation/glossary: clarify limitations of pseudorefsPatrick Steinhardt, Apr 30, 2024
  30. Kristoffer HaugsbakkApr 30, 2024
  31. 03/10 Documentation/glossary: define root refs as refsPatrick Steinhardt, Apr 30, 2024
  32. Karthik NayakApr 30, 2024
  33. 04/10 refs: rename `is_pseudoref()` to `is_root_ref()`Patrick Steinhardt, Apr 30, 2024
  34. Junio C HamanoApr 30, 2024
  35. 05/10 refs: refname `is_special_ref()` to `is_pseudo_ref()`Patrick Steinhardt, Apr 30, 2024
  36. Karthik NayakApr 30, 2024
  37. 06/10 refs: classify HEAD as a root refPatrick Steinhardt, Apr 30, 2024
  38. 07/10 refs: root refs can be symbolic refsPatrick Steinhardt, Apr 30, 2024
  39. Justin ToblerApr 30, 2024
  40. Patrick SteinhardtMay 2, 2024
  41. Justin ToblerMay 3, 2024
  42. Patrick SteinhardtMay 7, 2024
  43. 08/10 refs: pseudorefs are no refsPatrick Steinhardt, Apr 30, 2024
  44. 09/10 ref-filter: properly distinuish pseudo and root refsPatrick Steinhardt, Apr 30, 2024
  45. Karthik NayakApr 30, 2024
  46. Patrick SteinhardtMay 2, 2024
  47. Karthik NayakMay 2, 2024
  48. 10/10 refs: refuse to write pseudorefsPatrick Steinhardt, Apr 30, 2024
  49. 00/10 Clarify pseudo-ref terminologyPatrick Steinhardt, May 2, 2024
  50. 01/10 Documentation/glossary: redefine pseudorefs as special refsPatrick Steinhardt, May 2, 2024
  51. 02/10 Documentation/glossary: clarify limitations of pseudorefsPatrick Steinhardt, May 2, 2024
  52. 03/10 Documentation/glossary: define root refs as refsPatrick Steinhardt, May 2, 2024
  53. 04/10 refs: rename `is_pseudoref()` to `is_root_ref()`Patrick Steinhardt, May 2, 2024
  54. 05/10 refs: refname `is_special_ref()` to `is_pseudo_ref()`Patrick Steinhardt, May 2, 2024
  55. 06/10 refs: classify HEAD as a root refPatrick Steinhardt, May 2, 2024
  56. 07/10 refs: root refs can be symbolic refsPatrick Steinhardt, May 2, 2024
  57. Jeff KingMay 3, 2024
  58. Patrick SteinhardtMay 15, 2024
  59. Patrick SteinhardtMay 15, 2024
  60. Jeff KingMay 15, 2024
  61. Patrick SteinhardtMay 15, 2024
  62. Jeff KingMay 15, 2024
  63. Patrick SteinhardtMay 15, 2024
  64. Jeff KingMay 15, 2024
  65. 08/10 refs: pseudorefs are no refsPatrick Steinhardt, May 2, 2024
  66. 09/10 ref-filter: properly distinuish pseudo and root refsPatrick Steinhardt, May 2, 2024
  67. 10/10 refs: refuse to write pseudorefsPatrick Steinhardt, May 2, 2024
  68. 00/10 Clarify pseudo-ref terminologyPatrick Steinhardt, May 10, 2024
  69. 01/10 Documentation/glossary: redefine pseudorefs as special refsPatrick Steinhardt, May 10, 2024
  70. 02/10 Documentation/glossary: clarify limitations of pseudorefsPatrick Steinhardt, May 10, 2024
  71. 03/10 Documentation/glossary: define root refs as refsPatrick Steinhardt, May 10, 2024
  72. 04/10 refs: rename `is_pseudoref()` to `is_root_ref()`Patrick Steinhardt, May 10, 2024
  73. 05/10 refs: refname `is_special_ref()` to `is_pseudo_ref()`Patrick Steinhardt, May 10, 2024
  74. 06/10 refs: root refs can be symbolic refsPatrick Steinhardt, May 10, 2024
  75. 07/10 refs: classify HEAD as a root refPatrick Steinhardt, May 10, 2024
  76. 08/10 refs: pseudorefs are no refsPatrick Steinhardt, May 10, 2024
  77. 09/10 ref-filter: properly distinuish pseudo and root refsPatrick Steinhardt, May 10, 2024
  78. 10/10 refs: refuse to write pseudorefsPatrick Steinhardt, May 10, 2024
  79. Junio C HamanoMay 10, 2024
  80. 00/10 Clarify pseudo-ref terminologyPatrick Steinhardt, May 15, 2024
  81. 01/10 Documentation/glossary: redefine pseudorefs as special refsPatrick Steinhardt, May 15, 2024
  82. 02/10 Documentation/glossary: clarify limitations of pseudorefsPatrick Steinhardt, May 15, 2024
  83. 03/10 Documentation/glossary: define root refs as refsPatrick Steinhardt, May 15, 2024
  84. 04/10 refs: rename `is_pseudoref()` to `is_root_ref()`Patrick Steinhardt, May 15, 2024
  85. 05/10 refs: rename `is_special_ref()` to `is_pseudo_ref()`Patrick Steinhardt, May 15, 2024
  86. 06/10 refs: do not check ref existence in `is_root_ref()`Patrick Steinhardt, May 15, 2024
  87. Justin ToblerMay 15, 2024
  88. Patrick SteinhardtMay 16, 2024
  89. 07/10 refs: classify HEAD as a root refPatrick Steinhardt, May 15, 2024
  90. Justin ToblerMay 15, 2024
  91. 08/10 refs: pseudorefs are no refsPatrick Steinhardt, May 15, 2024
  92. 09/10 ref-filter: properly distinuish pseudo and root refsPatrick Steinhardt, May 15, 2024
  93. 10/10 refs: refuse to write pseudorefsPatrick Steinhardt, May 15, 2024

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.