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

[PATCH 1/4] ref-cache.c: fix prefix matching in ref iteration

From
Victoria Dye via GitGitGadget <gitgitgadget@gmail.com>
Date
Oct 6, 2023, 18:09 UTC
Message-ID
<59276a5b3fd1fd3b25db73e096cf0e834af2d4f9.1696615769.git.gitgitgadget@gmail.com>
In-Reply-To
<pull.1594.git.1696615769.gitgitgadget@gmail.com>
From: Victoria Dye <vdye@github.com>

Update 'cache_ref_iterator_advance' to skip over refs that are not matched by the given prefix.

Currently, a ref entry is considered "matched" if the entry name is fully contained within the prefix:

* prefix: "refs/heads/v1"
* entry: "refs/heads/v1.0"
OR if the prefix is fully contained in the entry name:
* prefix: "refs/heads/v1.0"
* entry: "refs/heads/v1"

The first case is always correct, but the second is only correct if the ref cache entry is a directory, for example:

* prefix: "refs/heads/example"
* entry: "refs/heads/"

Modify the logic in 'cache_ref_iterator_advance' to reflect these expectations:

1. If 'overlaps_prefix' returns 'PREFIX_EXCLUDES_DIR', then the prefix and
   ref cache entry do not overlap at all. Skip this entry.
2. If 'overlaps_prefix' returns 'PREFIX_WITHIN_DIR', then the prefix matches
   inside this entry if it is a directory. Skip if the entry is not a
   directory, otherwise iterate over it.
3. Otherwise, 'overlaps_prefix' returned 'PREFIX_CONTAINS_DIR', indicating
   that the cache entry (directory or not) is fully contained by or equal to
   the prefix. Iterate over this entry.

Note that condition 2 relies on the names of directory entries having the appropriate trailing slash. The existing function documentation of 'create_dir_entry' explicitly calls out the trailing slash requirement, so this is a safe assumption to make.

Signed-off-by: Victoria Dye <vdye@github.com>
---
 refs/ref-cache.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/refs/ref-cache.c b/refs/ref-cache.c
index 2294c4564fb..6e3b725245c 100644
--- a/refs/ref-cache.c
+++ b/refs/ref-cache.c
@@ -412,7 +412,8 @@ static int cache_ref_iterator_advance(struct ref_iterator *ref_iterator)
 
 		if (level->prefix_state == PREFIX_WITHIN_DIR) {
 			entry_prefix_state = overlaps_prefix(entry->name, iter->prefix);
-			if (entry_prefix_state == PREFIX_EXCLUDES_DIR)
+			if (entry_prefix_state == PREFIX_EXCLUDES_DIR ||
+			    (entry_prefix_state == PREFIX_WITHIN_DIR && !(entry->flag & REF_DIR)))
 				continue;
 		} else {
 			entry_prefix_state = level->prefix_state;
-- 
gitgitgadget
Previous: Victoria Dye via GitGitGadgetNext: Junio C Hamano
Message 2 of 21 in “Performance improvement & cleanup in loose ref iteration”
  1. 0/4 Performance improvement & cleanup in loose ref iterationVictoria Dye via GitGitGadget, Oct 6, 2023
  2. 1/4 ref-cache.c: fix prefix matching in ref iterationVictoria Dye via GitGitGadget, Oct 6, 2023
  3. Junio C HamanoOct 6, 2023
  4. Patrick SteinhardtOct 9, 2023
  5. Victoria DyeOct 9, 2023
  6. Junio C HamanoOct 9, 2023
  7. 3/4 dir.[ch]: add 'follow_symlink' arg to 'get_dtype'Victoria Dye via GitGitGadget, Oct 6, 2023
  8. 2/4 dir.[ch]: expose 'get_dtype'Victoria Dye via GitGitGadget, Oct 6, 2023
  9. Junio C HamanoOct 6, 2023
  10. 4/4 files-backend.c: avoid stat in 'loose_fill_ref_dir'Victoria Dye via GitGitGadget, Oct 6, 2023
  11. Junio C HamanoOct 6, 2023
  12. Junio C HamanoOct 6, 2023
  13. Patrick SteinhardtOct 9, 2023
  14. Victoria DyeOct 9, 2023
  15. Patrick SteinhardtOct 10, 2023
  16. 0/4 Performance improvement & cleanup in loose ref iterationVictoria Dye via GitGitGadget, Oct 9, 2023
  17. 1/4 ref-cache.c: fix prefix matching in ref iterationVictoria Dye via GitGitGadget, Oct 9, 2023
  18. Patrick SteinhardtOct 10, 2023
  19. 2/4 dir.[ch]: expose 'get_dtype'Victoria Dye via GitGitGadget, Oct 9, 2023
  20. 3/4 dir.[ch]: add 'follow_symlink' arg to 'get_dtype'Victoria Dye via GitGitGadget, Oct 9, 2023
  21. 4/4 files-backend.c: avoid stat in 'loose_fill_ref_dir'Victoria Dye via GitGitGadget, Oct 9, 2023

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.