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

[PATCH 0/3] Clarify pseudo-ref terminology

From
Patrick Steinhardt <ps@pks.im>
Date
Apr 29, 2024, 13:41 UTC
Message-ID
<cover.1714398019.git.ps@pks.im>
Hi,

there is quite some confusion around what is a pseudo ref and what is a special ref, and the documentation in gitglossary(7) overlaps. This patch series clarifies that:

  - A pseudo ref is anything in the root directory that conforms to the
    pseudo ref syntax (all uppercase, must end with _HEAD), except for
    special refs. There are some exceptions that are now listed
    explicitly, and these only exist due to historic reasons.
  - Special refs are really only either FETCH_HEAD or MERGE_HEAD, where
    the reason is that those aren't really refs, but can sometimes be
    used as such.

I was very much pressed to go a completely different way: drop the special ref term again that we have recently introduced and replace the pseudo ref term with it. This would return pseudo refs to their original meaning, namely something that is not a ref, but behaves like one at times.

The current class of pseudo refs I would then drop completely -- in my opinion there is just no need for it. Everything should be a ref, and what we currently call pseudo refs (things in the root hierarchy) is really just a naming policy. Refs must either have pseudoref syntax or they must start with "refs/". It doesn't help in my opinion that we give refs which conform to that naming policy but happen to live in the root directory a separate name. They behave no different than a normal ref anyway: they are stored in the refdb and can be read and written as any other ref starting with "refs/".

So, if we went down that road, we would:
  - Not have special refs anymore.
  - Have two pseudo refs, FETCH_HEAD and MERGE_HEAD. There is no other
    pseudo ref.
  - Clarify that refs must either start with "refs/", or have an
    all-uppercase name ending with "_HEAD". Exceptions to this rule are
    "HEAD" and a couple of others that we wrote due to historic reasons.
    All refs that match these rules behave the same, there is no
    difference between root refs and refs living in "refs/".

I think that this would be quite a lot easier to understand than the current state of affairs we have, and also return us to the original meaning of pseudorefs.

If people agree with that line of thought I'll happily revise this patch series. I didn't do that yet because it would be quite a lot more work, so I first wanted to get some buy-in.

Patrick
Patrick Steinhardt (3):
  refs: move `is_special_ref()`
  refs: do not label special refs as pseudo refs
  refs: fix segfault in `is_pseudoref()` when ref cannot be resolved
 Documentation/glossary-content.txt | 36 +++++++------
 refs.c                             | 81 ++++++++++++++----------------
 t/t6302-for-each-ref-filter.sh     | 17 +++++++
 3 files changed, 76 insertions(+), 58 deletions(-)
-- 
2.45.0-rc1
Next: Patrick Steinhardt
Message 1 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.