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

Re: [PATCH v2 04/24] refs: convert update_ref and refs_update_ref to use struct object_id

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Oct 12, 2017, 08:42 UTC
Message-ID
<20171012084232.gag72xmflhpsk6wo@genre.crustytoothpaste.net>
In-Reply-To
<9d4c3854-38fb-d5b4-0436-0eee707201ab@alum.mit.edu>
On Wed, Oct 11, 2017 at 08:33:46AM +0200, Michael Haggerty wrote:
Show 13 quoted lines
> On 10/09/2017 03:11 AM, brian m. carlson wrote:
> > diff --git a/refs.c b/refs.c
> > index 0a5b68d6fb..51942df7b3 100644
> > --- a/refs.c
> > +++ b/refs.c
> > [...]
> > @@ -1003,12 +995,12 @@ int refs_update_ref(struct ref_store *refs, const char *msg,
> >  	int ret = 0;
> >  
> >  	if (ref_type(refname) == REF_TYPE_PSEUDOREF) {
> > -		assert(refs == get_main_ref_store());
> 
> Was the deletion of the line above intentional?

No, that would not have been intentional. (I would have mentioned it in the commit message if it were.) I probably accidentally deleted a line in my editor. Will fix.

Show 18 quoted lines
> > -		ret = write_pseudoref(refname, new_sha1, old_sha1, &err);
> > +		ret = write_pseudoref(refname, new_oid, old_oid, &err);
> 
> This is not new to your code, but I just noticed a problem here.
> `refs_update_ref()` is documented, via its reference to
> `ref_transaction_update()`, to allow `new_sha1` (i.e., now `new_oid`) to
> be NULL. (NULL signifies that the value of the reference shouldn't be
> changed.)
> 
> But `write_pseudoref()` dereferences its `oid` argument unconditionally,
> so this call would fail if `new_oid` is NULL.
> 
> This has all been the case since `write_pseudoref()` was introduced in
> 74ec19d4be (pseudorefs: create and use pseudoref update and delete
> functions, 2015-07-31).
> 
> In my opinion, `write_pseudoref()` is broken. It should accept NULL as
> its `oid` argument.
I can stuff a patch in for that.
-- 
brian m. carlson / brian with sandals: Houston, Texas, US
https://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: https://keybase.io/bk2204
Previous: Michael HaggertyNext: brian m. carlson
Message 11 of 53 in “object_id part 10”
  1. 00/24 object_id part 10brian m. carlson, Oct 9, 2017
  2. 01/24 walker: convert to struct object_idbrian m. carlson, Oct 9, 2017
  3. Jonathan NiederOct 9, 2017
  4. 03/24 refs: convert delete_ref and refs_delete_ref to struct object_idbrian m. carlson, Oct 9, 2017
  5. Jonathan NiederOct 9, 2017
  6. 02/24 refs/files-backend: convert struct ref_to_prune to object_idbrian m. carlson, Oct 9, 2017
  7. Jonathan NiederOct 9, 2017
  8. 04/24 refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson, Oct 9, 2017
  9. Jonathan NiederOct 9, 2017
  10. Michael HaggertyOct 11, 2017
  11. brian m. carlsonOct 12, 2017
  12. 10/24 builtin/reflog: convert remaining unsigned char uses to object_idbrian m. carlson, Oct 9, 2017
  13. Jonathan NiederOct 10, 2017
  14. 09/24 refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson, Oct 9, 2017
  15. Jonathan NiederOct 10, 2017
  16. 12/24 pack-bitmap: convert traverse_bitmap_commit_list to object_idbrian m. carlson, Oct 9, 2017
  17. Jonathan NiederOct 10, 2017
  18. 18/24 Convert remaining callers of resolve_gitlink_ref to object_idbrian m. carlson, Oct 9, 2017
  19. 21/24 refs: convert resolve_ref_unsafe to struct object_idbrian m. carlson, Oct 9, 2017
  20. Michael HaggertyOct 11, 2017
  21. 24/24 refs/files-backend: convert static functions to object_idbrian m. carlson, Oct 9, 2017
  22. Michael HaggertyOct 11, 2017
  23. 22/24 refs: convert peel_object to struct object_idbrian m. carlson, Oct 9, 2017
  24. 23/24 refs: convert read_raw_ref backends to struct object_idbrian m. carlson, Oct 9, 2017
  25. Michael HaggertyOct 11, 2017
  26. 19/24 refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson, Oct 9, 2017
  27. 20/24 worktree: convert struct worktree to object_idbrian m. carlson, Oct 9, 2017
  28. 15/24 refs: convert read_ref_at to struct object_idbrian m. carlson, Oct 9, 2017
  29. 14/24 refs: convert peel_ref to struct object_idbrian m. carlson, Oct 9, 2017
  30. Michael HaggertyOct 11, 2017
  31. 17/24 sha1_file: convert index_path and index_fd to struct object_idbrian m. carlson, Oct 9, 2017
  32. 13/24 builtin/pack-objects: convert to struct object_idbrian m. carlson, Oct 9, 2017
  33. Jonathan NiederOct 10, 2017
  34. 16/24 refs: convert reflog_expire parameter to struct object_idbrian m. carlson, Oct 9, 2017
  35. 08/24 refs: convert read_ref and read_ref_full to object_idbrian m. carlson, Oct 9, 2017
  36. Jonathan NiederOct 10, 2017
  37. 11/24 refs: convert dwim_log to struct object_idbrian m. carlson, Oct 9, 2017
  38. Jonathan NiederOct 10, 2017
  39. 07/24 refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson, Oct 9, 2017
  40. Jonathan NiederOct 9, 2017
  41. Junio C HamanoOct 10, 2017
  42. 05/24 refs: update ref transactions to use struct object_idbrian m. carlson, Oct 9, 2017
  43. Jonathan NiederOct 9, 2017
  44. Michael HaggertyOct 11, 2017
  45. 06/24 Convert check_connected to use struct object_idbrian m. carlson, Oct 9, 2017
  46. Jonathan NiederOct 9, 2017
  47. Stefan BellerOct 9, 2017
  48. Junio C HamanoOct 9, 2017
  49. Michael HaggertyOct 11, 2017
  50. Junio C HamanoOct 11, 2017
  51. brian m. carlsonOct 12, 2017
  52. Junio C HamanoOct 12, 2017
  53. brian m. carlsonOct 12, 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.