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

Re: [PATCH v2 05/36] resolve-undo: convert struct resolve_undo_info to object_id

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Feb 27, 2018, 02:01 UTC
Message-ID
<20180227020111.GG4620@genre.crustytoothpaste.net>
In-Reply-To
<CACsJy8AnTp1kzwUbAY_9XKg=A6Mo0gUa8o_dimx=+c1rFqu16w@mail.gmail.com>
On Mon, Feb 26, 2018 at 06:25:24PM +0700, Duy Nguyen wrote:
Show 20 quoted lines
> On Mon, Feb 26, 2018 at 4:11 AM, brian m. carlson
> <sandals@crustytoothpaste.net> wrote:
> > @@ -44,7 +44,7 @@ void resolve_undo_write(struct strbuf *sb, struct string_list *resolve_undo)
> >                 for (i = 0; i < 3; i++) {
> >                         if (!ui->mode[i])
> >                                 continue;
> > -                       strbuf_add(sb, ui->sha1[i], 20);
> > +                       strbuf_add(sb, ui->oid[i].hash, the_hash_algo->rawsz);
> >                 }
> >         }
> >  }
> > @@ -89,7 +89,7 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)
> >                                 continue;
> >                         if (size < 20)
> >                                 goto error;
> > -                       hashcpy(ui->sha1[i], (const unsigned char *)data);
> > +                       hashcpy(ui->oid[i].hash, (const unsigned char *)data);
> >                         size -= 20;
> >                         data += 20;
> >                 }

It looks like I may have missed a conversion there. I'll fix that in a reroll.

Show 11 quoted lines
> Here we see the same pattern again, but this time the @@ lines give
> better context: these are actually hash I/O. Maybe it's about time we
> add
> 
> int oidwrite(char *, size_t , const struct object_id *);
> // optionally, void strbuf_addoid(struct strbuf *, const struct object_id *);
> int oidread(struct object_id *, const char *, size_t);
> 
> for conversion from between an object_id in memory and on disk? It
> would probably be a straight memcpy for all hash algorithms so we
> don't really need new function pointers in git_hash_algo for this.

I don't have a strong opinion about adding those or not adding them; if people think it makes the code cleaner to read, I'm happy to add them. It would probably makes sense to make them inline if we do, so that the compiler can optimize them best.

I think we do need to preserve hashcpy anyway for a handful of cases (such as pack checksums and rerere) that aren't technically object IDs and won't use those functions. I encountered a similar experience with get_sha1_hex recently: there are a handful of cases that want to read the name of a pack or a rerere cache, which are not object IDs.

-- 
brian m. carlson / brian with sandals: Houston, Texas, US
https://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: https://keybase.io/bk2204
Previous: Duy NguyenNext: Duy Nguyen
Message 34 of 42 in “object_id part 12”
  1. 00/36 object_id part 12brian m. carlson, Feb 25, 2018
  2. 01/36 bulk-checkin: convert index_bulk_checkin to struct object_idbrian m. carlson, Feb 25, 2018
  3. 03/36 cache-tree: convert write_*_as_tree to object_idbrian m. carlson, Feb 25, 2018
  4. 04/36 cache-tree: convert remnants to struct object_idbrian m. carlson, Feb 25, 2018
  5. Duy NguyenFeb 26, 2018
  6. 02/36 builtin/write-tree: convert to struct object_idbrian m. carlson, Feb 25, 2018
  7. 06/36 tree: convert read_tree_recursive to struct object_idbrian m. carlson, Feb 25, 2018
  8. 12/36 send-pack: convert remaining functions to struct object_idbrian m. carlson, Feb 25, 2018
  9. 13/36 replace_object: convert struct replace_object to object_idbrian m. carlson, Feb 25, 2018
  10. 14/36 builtin/mktag: convert to struct object_idbrian m. carlson, Feb 25, 2018
  11. 15/36 archive: convert write_archive_entry_fn_t to object_idbrian m. carlson, Feb 25, 2018
  12. 17/36 builtin/index-pack: convert struct ref_delta_entry to object_idbrian m. carlson, Feb 25, 2018
  13. 18/36 sha1_file: convert read_loose_object to use struct object_idbrian m. carlson, Feb 25, 2018
  14. 23/36 sha1_file: convert retry_bad_packed_offset to struct object_idbrian m. carlson, Feb 25, 2018
  15. 30/36 streaming: convert istream internals to struct object_idbrian m. carlson, Feb 25, 2018
  16. 22/36 sha1_file: convert assert_sha1_type to object_idbrian m. carlson, Feb 25, 2018
  17. 29/36 tree-walk: convert get_tree_entry_follow_symlinks internals to object_idbrian m. carlson, Feb 25, 2018
  18. 32/36 sha1_file: convert read_object_with_reference to object_idbrian m. carlson, Feb 25, 2018
  19. 35/36 sha1_file: introduce a constant for max header lengthbrian m. carlson, Feb 25, 2018
  20. 34/36 Convert lookup_replace_object to struct object_idbrian m. carlson, Feb 25, 2018
  21. Duy NguyenFeb 26, 2018
  22. 33/36 sha1_file: convert read_sha1_file to struct object_idbrian m. carlson, Feb 25, 2018
  23. 36/36 convert: convert to struct object_idbrian m. carlson, Feb 25, 2018
  24. 31/36 tree-walk: convert tree entry functions to object_idbrian m. carlson, Feb 25, 2018
  25. 28/36 builtin/notes: convert static functions to object_idbrian m. carlson, Feb 25, 2018
  26. 27/36 builtin/fmt-merge-msg: convert remaining code to object_idbrian m. carlson, Feb 25, 2018
  27. 26/36 sha1_file: convert sha1_object_info* to object_idbrian m. carlson, Feb 25, 2018
  28. 25/36 Convert remaining callers of sha1_object_info_extended to object_idbrian m. carlson, Feb 25, 2018
  29. 24/36 packfile: convert unpack_entry to struct object_idbrian m. carlson, Feb 25, 2018
  30. 21/36 builtin/mktree: convert to struct object_idbrian m. carlson, Feb 25, 2018
  31. 11/36 http-walker: convert struct object_request to use struct object_idbrian m. carlson, Feb 25, 2018
  32. 05/36 resolve-undo: convert struct resolve_undo_info to object_idbrian m. carlson, Feb 25, 2018
  33. Duy NguyenFeb 26, 2018
  34. brian m. carlsonFeb 27, 2018
  35. Duy NguyenFeb 28, 2018
  36. 20/36 streaming: convert open_istream to use struct object_idbrian m. carlson, Feb 25, 2018
  37. 19/36 sha1_file: convert check_sha1_signature to struct object_idbrian m. carlson, Feb 25, 2018
  38. 16/36 archive: convert sha1_file_to_archive to struct object_idbrian m. carlson, Feb 25, 2018
  39. 10/36 Convert find_unique_abbrev* to struct object_idbrian m. carlson, Feb 25, 2018
  40. 09/36 wt-status: convert struct wt_status_state to object_idbrian m. carlson, Feb 25, 2018
  41. 08/36 strbuf: convert strbuf_add_unique_abbrev to use struct object_idbrian m. carlson, Feb 25, 2018
  42. 07/36 ref-filter: convert grab_objectname to struct object_idbrian m. carlson, Feb 25, 2018

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.