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

[PATCH v5 0/5] for-each-ref: add '--include-root-refs' option

From
Karthik Nayak <karthik.188@gmail.com>
Date
Feb 23, 2024, 10:01 UTC
Message-ID
<20240223100112.44127-1-karthik.188@gmail.com>
In-Reply-To
<20240119142705.139374-1-karthik.188@gmail.com>

This is the fifth version of my patch series to print root refs in git-for-each-ref(1).

With the introduction of the reftable backend, it becomes ever so important to provide the necessary tooling for printing all refs associated with a worktree.

While regular refs stored within the "refs/" namespace are currently supported by multiple commands like git-for-each-ref(1), git-show-ref(1). Neither support printing root refs within the worktree.

This patch series is a follow up to the RFC/discussion we had earlier on the list [1].

The first 4 commits add the required functionality to ensure we can print all refs (regular, pseudo, HEAD). The 5th commit modifies the git-for-each-ref(1) command to add the "--include-root-refs" command which will include HEAD and pseudorefs with regular "refs/" refs.

[1]: https://lore.kernel.org/git/20231221170715.110565-1-karthik.188@gmail.com/#t
Changes from v4:
1. Fixed erratic whitespace
2. Remove braces from single line block
3. Starting the comments with a capital and also adding more context.
4. Removed a duplicate check.
Thanks for the reviews.
Range diff against v4:
1:  98130a7ad7 ! 1:  6016042965 refs: introduce `is_pseudoref()` and `is_headref()`
    @@ refs.c: static int is_pseudoref_syntax(const char *refname)
     +
     +	if (ends_with(refname, "_HEAD")) {
     +		refs_resolve_ref_unsafe(refs, refname,
    -+   					RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
    -+   					&oid, NULL);
    -+   		return !is_null_oid(&oid);
    ++					RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
    ++					&oid, NULL);
    ++		return !is_null_oid(&oid);
     +	}
     +
     +	for (i = 0; i < ARRAY_SIZE(irregular_pseudorefs); i++)
     +		if (!strcmp(refname, irregular_pseudorefs[i])) {
     +			refs_resolve_ref_unsafe(refs, refname,
    -+   						RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
    -+   						&oid, NULL);
    ++						RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
    ++						&oid, NULL);
     +			return !is_null_oid(&oid);
     +		}
     +
2:  060ab08af5 = 2:  acaa014841 refs: extract out `loose_fill_ref_dir_regular_file()`
3:  40d2375ad9 = 3:  f51c5bc307 refs: introduce `refs_for_each_include_root_refs()`
4:  b4b9435505 = 4:  7c004db6e7 ref-filter: rename 'FILTER_REFS_ALL' to 'FILTER_REFS_REGULAR'
5:  ee99ac41ae ! 5:  53f6c0a6db for-each-ref: add new option to include root refs
    @@ builtin/for-each-ref.c: int cmd_for_each_ref(int argc, const char **argv, const
      		filter.name_patterns = argv;
      	}
      
    -+	if (include_root_refs) {
    ++	if (include_root_refs)
     +		flags |= FILTER_REFS_ROOT_REFS;
    -+	}
     +
      	filter.match_as_path = 1;
     -	filter_and_format_refs(&filter, FILTER_REFS_REGULAR, sorting, &format);
    @@ ref-filter.c: static int for_each_fullref_in_pattern(struct ref_filter *filter,
      				       void *cb_data)
      {
     +	if (filter->kind == FILTER_REFS_KIND_MASK) {
    -+		/* in this case, we want to print all refs including root refs. */
    ++		/* In this case, we want to print all refs including root refs. */
     +		return refs_for_each_include_root_refs(get_main_ref_store(the_repository),
     +						       cb, cb_data);
     +	}
    @@ ref-filter.c: static struct ref_array_item *apply_ref_filter(const char *refname
      
      	/* Obtain the current ref kind from filter_ref_kind() and ignore unwanted refs. */
      	kind = filter_ref_kind(filter, refname);
    +-	if (!(kind & filter->kind))
     +
     +	/*
    -+	 * When printing HEAD with all other refs, we want to apply the same formatting
    -+	 * rules as the other refs, so we simply ask it to be treated as a pseudoref.
    ++	 * Generally HEAD refs are printed with special description denoting a rebase,
    ++	 * detached state and so forth. This is useful when only printing the HEAD ref
    ++	 * But when it is being printed along with other pseudorefs, it makes sense to
    ++	 * keep the formatting consistent. So we mask the type to act like a pseudoref.
     +	 */
     +	if (filter->kind == FILTER_REFS_KIND_MASK && kind == FILTER_REFS_DETACHED_HEAD)
     +		kind = FILTER_REFS_PSEUDOREFS;
     +	else if (!(kind & filter->kind))
    -+		return NULL;
    -+
    - 	if (!(kind & filter->kind))
      		return NULL;
      
    + 	if (!filter_pattern_match(filter, refname))
     @@ ref-filter.c: static int do_filter_refs(struct ref_filter *filter, unsigned int type, each_ref
      			ret = for_each_fullref_in("refs/tags/", fn, cb_data);
      		else if (filter->kind & FILTER_REFS_REGULAR)
Karthik Nayak (5):
  refs: introduce `is_pseudoref()` and `is_headref()`
  refs: extract out `loose_fill_ref_dir_regular_file()`
  refs: introduce `refs_for_each_include_root_refs()`
  ref-filter: rename 'FILTER_REFS_ALL' to 'FILTER_REFS_REGULAR'
  for-each-ref: add new option to include root refs
 Documentation/git-for-each-ref.txt |   5 +-
 builtin/for-each-ref.c             |  10 ++-
 ref-filter.c                       |  30 ++++++-
 ref-filter.h                       |   7 +-
 refs.c                             |  48 +++++++++++
 refs.h                             |   9 ++
 refs/files-backend.c               | 127 +++++++++++++++++++++--------
 refs/refs-internal.h               |   6 ++
 refs/reftable-backend.c            |  11 ++-
 t/t6302-for-each-ref-filter.sh     |  31 +++++++
 10 files changed, 237 insertions(+), 47 deletions(-)
-- 
2.43.GIT
Previous: Patrick SteinhardtNext: Karthik Nayak
Message 85 of 94 in “for-each-ref: print all refs on empty string pattern”
  1. 0/5 for-each-ref: print all refs on empty string patternKarthik Nayak, Jan 19, 2024
  2. 1/5 refs: expose `is_pseudoref_syntax()`Karthik Nayak, Jan 19, 2024
  3. Junio C HamanoJan 19, 2024
  4. Karthik NayakJan 22, 2024
  5. 2/5 refs: make `is_pseudoref_syntax()` stricterKarthik Nayak, Jan 19, 2024
  6. Junio C HamanoJan 19, 2024
  7. Phillip WoodJan 22, 2024
  8. Junio C HamanoJan 22, 2024
  9. Phillip WoodJan 23, 2024
  10. Karthik NayakJan 23, 2024
  11. phillip.wood123@gmail.comJan 23, 2024
  12. Junio C HamanoJan 23, 2024
  13. Junio C HamanoJan 23, 2024
  14. Patrick SteinhardtJan 23, 2024
  15. Phillip WoodJan 23, 2024
  16. Junio C HamanoJan 23, 2024
  17. Patrick SteinhardtJan 24, 2024
  18. 3/5 refs: extract out `loose_fill_ref_dir_regular_file()`Karthik Nayak, Jan 19, 2024
  19. 4/5 refs: introduce `refs_for_each_all_refs()`Karthik Nayak, Jan 19, 2024
  20. Junio C HamanoJan 19, 2024
  21. Karthik NayakJan 22, 2024
  22. Junio C HamanoJan 22, 2024
  23. 5/5 for-each-ref: avoid filtering on empty patternKarthik Nayak, Jan 19, 2024
  24. 0/4 for-each-ref: print all refs on empty string patternKarthik Nayak, Jan 24, 2024
  25. 1/4 refs: introduce `is_pseudoref()` and `is_headref()`Karthik Nayak, Jan 24, 2024
  26. Junio C HamanoJan 24, 2024
  27. Karthik NayakJan 25, 2024
  28. Junio C HamanoJan 25, 2024
  29. Karthik NayakJan 25, 2024
  30. 2/4 refs: extract out `loose_fill_ref_dir_regular_file()`Karthik Nayak, Jan 24, 2024
  31. 3/4 refs: introduce `refs_for_each_all_refs()`Karthik Nayak, Jan 24, 2024
  32. 4/4 for-each-ref: avoid filtering on empty patternKarthik Nayak, Jan 24, 2024
  33. 0/4 for-each-ref: print all refs on empty string patternKarthik Nayak, Jan 29, 2024
  34. 1/4 refs: introduce `is_pseudoref()` and `is_headref()`Karthik Nayak, Jan 29, 2024
  35. Jeff KingFeb 7, 2024
  36. Karthik NayakFeb 7, 2024
  37. 2/4 refs: extract out `loose_fill_ref_dir_regular_file()`Karthik Nayak, Jan 29, 2024
  38. 3/4 refs: introduce `refs_for_each_all_refs()`Karthik Nayak, Jan 29, 2024
  39. 4/4 for-each-ref: avoid filtering on empty patternKarthik Nayak, Jan 29, 2024
  40. Phillip WoodFeb 5, 2024
  41. Patrick SteinhardtFeb 6, 2024
  42. Phillip WoodFeb 6, 2024
  43. Karthik NayakFeb 6, 2024
  44. Phillip WoodFeb 6, 2024
  45. Karthik NayakFeb 6, 2024
  46. Junio C HamanoFeb 6, 2024
  47. Junio C HamanoFeb 6, 2024
  48. Karthik NayakFeb 6, 2024
  49. Junio C HamanoFeb 6, 2024
  50. Karthik NayakFeb 7, 2024
  51. Junio C HamanoFeb 7, 2024
  52. Karthik NayakFeb 7, 2024
  53. Junio C HamanoFeb 7, 2024
  54. Karthik NayakFeb 7, 2024
  55. Patrick SteinhardtFeb 8, 2024
  56. Junio C HamanoFeb 8, 2024
  57. Patrick SteinhardtFeb 8, 2024
  58. Junio C HamanoFeb 8, 2024
  59. Patrick SteinhardtFeb 9, 2024
  60. Junio C HamanoFeb 9, 2024
  61. Karthik NayakFeb 9, 2024
  62. Patrick SteinhardtFeb 12, 2024
  63. Phillip WoodFeb 8, 2024
  64. Junio C HamanoFeb 8, 2024
  65. Patrick SteinhardtFeb 7, 2024
  66. Junio C HamanoFeb 7, 2024
  67. Junio C HamanoJan 29, 2024
  68. 0/5 for-each-ref: add '--include-root-refs' optionKarthik Nayak, Feb 11, 2024
  69. 1/5 refs: introduce `is_pseudoref()` and `is_headref()`Karthik Nayak, Feb 11, 2024
  70. Patrick SteinhardtFeb 12, 2024
  71. Junio C HamanoFeb 12, 2024
  72. Karthik NayakFeb 13, 2024
  73. Junio C HamanoFeb 13, 2024
  74. Karthik NayakFeb 14, 2024
  75. Junio C HamanoFeb 14, 2024
  76. Karthik NayakFeb 14, 2024
  77. Junio C HamanoFeb 12, 2024
  78. 2/5 refs: extract out `loose_fill_ref_dir_regular_file()`Karthik Nayak, Feb 11, 2024
  79. 3/5 refs: introduce `refs_for_each_include_root_refs()`Karthik Nayak, Feb 11, 2024
  80. 4/5 ref-filter: rename 'FILTER_REFS_ALL' to 'FILTER_REFS_REGULAR'Karthik Nayak, Feb 11, 2024
  81. 5/5 for-each-ref: add new option to include root refsKarthik Nayak, Feb 11, 2024
  82. Patrick SteinhardtFeb 22, 2024
  83. Karthik NayakFeb 22, 2024
  84. Patrick SteinhardtFeb 22, 2024
  85. 0/5 for-each-ref: add '--include-root-refs' optionKarthik Nayak, Feb 23, 2024
  86. 1/5 refs: introduce `is_pseudoref()` and `is_headref()`Karthik Nayak, Feb 23, 2024
  87. 2/5 refs: extract out `loose_fill_ref_dir_regular_file()`Karthik Nayak, Feb 23, 2024
  88. 3/5 refs: introduce `refs_for_each_include_root_refs()`Karthik Nayak, Feb 23, 2024
  89. 4/5 ref-filter: rename 'FILTER_REFS_ALL' to 'FILTER_REFS_REGULAR'Karthik Nayak, Feb 23, 2024
  90. 5/5 for-each-ref: add new option to include root refsKarthik Nayak, Feb 23, 2024
  91. Junio C HamanoFeb 23, 2024
  92. Junio C HamanoFeb 23, 2024
  93. Patrick SteinhardtFeb 27, 2024
  94. Junio C HamanoFeb 27, 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.