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

Re: [PATCH 18/20] commit_packed_refs(): use reference iteration

From
Jeff King <peff@peff.net>
Date
Mar 20, 2017, 18:05 UTC
Message-ID
<20170320180532.vxzra6tpf3t7qjks@sigill.intra.peff.net>
In-Reply-To
<b8d279659c6755c5d042a3062b526e4752114c38.1490026594.git.mhagger@alum.mit.edu>
On Mon, Mar 20, 2017 at 05:33:23PM +0100, Michael Haggerty wrote:
Show 15 quoted lines
> -/*
> - * An each_ref_entry_fn that writes the entry to a packed-refs file.
> - */
> -static int write_packed_entry_fn(struct ref_entry *entry, void *cb_data)
> -{
> -	enum peel_status peel_status = peel_entry(entry, 0);
> -
> -	if (peel_status != PEEL_PEELED && peel_status != PEEL_NON_TAG)
> -		error("internal error: %s is not a valid packed reference!",
> -		      entry->name);
> -	write_packed_entry(cb_data, entry->name, entry->u.value.oid.hash,
> -			   peel_status == PEEL_PEELED ?
> -			   entry->u.value.peeled.hash : NULL);
> -	return 0;
> -}

This assertion goes away. It can't be moved into write_packed_entry() because the peel status is only known in the caller.

But here:
Show 15 quoted lines
> @@ -1376,8 +1362,18 @@ static int commit_packed_refs(struct files_ref_store *refs)
>  		die_errno("unable to fdopen packed-refs descriptor");
>  
>  	fprintf_or_die(out, "%s", PACKED_REFS_HEADER);
> -	do_for_each_entry_in_dir(get_packed_ref_dir(packed_ref_cache),
> -				 write_packed_entry_fn, out);
> +
> +	iter = cache_ref_iterator_begin(packed_ref_cache->cache, NULL, 0);
> +	while ((ok = ref_iterator_advance(iter)) == ITER_OK) {
> +		struct object_id peeled;
> +		int peel_error = ref_iterator_peel(iter, &peeled);
> +
> +		write_packed_entry(out, iter->refname, iter->oid->hash,
> +				   peel_error ? NULL : peeled.hash);
> +	}
Should we be checking that peel_error is only PEELED or NON_TAG?
-Peff
Previous: Michael HaggertyNext: Michael Haggerty
Message 10 of 38 in “Separate `ref_cache` into a separate module”
  1. 00/20 Separate `ref_cache` into a separate moduleMichael Haggerty, Mar 20, 2017
  2. 01/20 get_ref_dir(): don't call read_loose_refs() for "refs/bisect"Michael Haggerty, Mar 20, 2017
  3. 10/20 ref-cache: introduce a new type, ref_cacheMichael Haggerty, Mar 20, 2017
  4. 13/20 refs: handle "refs/bisect/" in `loose_fill_ref_dir()`Michael Haggerty, Mar 20, 2017
  5. 11/20 refs: record the ref_store in ref_cache, not ref_dirMichael Haggerty, Mar 20, 2017
  6. Jeff KingMar 20, 2017
  7. Michael HaggertyMar 20, 2017
  8. 08/20 Rename `remove_entry()` to `remove_entry_from_dir()`Michael Haggerty, Mar 20, 2017
  9. 18/20 commit_packed_refs(): use reference iterationMichael Haggerty, Mar 20, 2017
  10. Jeff KingMar 20, 2017
  11. Michael HaggertyMar 22, 2017
  12. Jeff KingMar 22, 2017
  13. 20/20 do_for_each_entry_in_dir(): delete functionMichael Haggerty, Mar 20, 2017
  14. 16/20 get_loose_ref_cache(): new functionMichael Haggerty, Mar 20, 2017
  15. 15/20 get_loose_ref_dir(): function renamed from get_loose_refs()Michael Haggerty, Mar 20, 2017
  16. 19/20 files_pack_refs(): use reference iterationMichael Haggerty, Mar 20, 2017
  17. 14/20 do_for_each_entry_in_dir(): eliminate `offset` argumentMichael Haggerty, Mar 20, 2017
  18. 03/20 refs_ref_iterator_begin(): new functionMichael Haggerty, Mar 20, 2017
  19. 17/20 cache_ref_iterator_begin(): make function smarterMichael Haggerty, Mar 20, 2017
  20. 07/20 Rename `find_ref()` to `find_ref_entry()`Michael Haggerty, Mar 20, 2017
  21. 12/20 ref-cache: use a callback function to fill the cacheMichael Haggerty, Mar 20, 2017
  22. 09/20 refs: split `ref_cache` code into separate filesMichael Haggerty, Mar 20, 2017
  23. Jeff KingMar 20, 2017
  24. Junio C HamanoMar 20, 2017
  25. Stefan BellerMar 20, 2017
  26. Junio C HamanoMar 20, 2017
  27. 04/20 refs_verify_refname_available(): implement once for all backendsMichael Haggerty, Mar 20, 2017
  28. Jeff KingMar 20, 2017
  29. Michael HaggertyMar 20, 2017
  30. 02/20 refs_read_raw_ref(): new functionMichael Haggerty, Mar 20, 2017
  31. 06/20 Rename `add_ref()` to `add_ref_entry()`Michael Haggerty, Mar 20, 2017
  32. 05/20 refs_verify_refname_available(): use function in more placesMichael Haggerty, Mar 20, 2017
  33. Junio C HamanoMar 20, 2017
  34. Jeff KingMar 20, 2017
  35. Ævar Arnfjörð BjarmasonMar 20, 2017
  36. Jeff KingMar 20, 2017
  37. Junio C HamanoMar 20, 2017
  38. Michael HaggertyMar 20, 2017

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.