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

[PATCH v2 36/36] convert: convert to struct object_id

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Feb 25, 2018, 21:12 UTC
Message-ID
<20180225211212.477570-37-sandals@crustytoothpaste.net>
In-Reply-To
<20180225211212.477570-1-sandals@crustytoothpaste.net>

Convert convert.c to struct object_id. Add a use of the_hash_algo to replace hard-coded constants and change a strbuf_add to a strbuf_addstr to avoid another hard-coded constant.

Note that a strict conversion using the hexsz constant would cause problems in the future if the internal and user-visible hash algorithms differed, as anticipated by the hash function transition plan.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 convert.c | 12 ++++++------
 convert.h |  2 +-
 entry.c   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/convert.c b/convert.c
index cc562f6509..c480097a2a 100644
--- a/convert.c
+++ b/convert.c
@@ -914,7 +914,7 @@ static int ident_to_worktree(const char *path, const char *src, size_t len,
 		to_free = strbuf_detach(buf, NULL);
 	hash_object_file(src, len, "blob", &oid);
 
-	strbuf_grow(buf, len + cnt * 43);
+	strbuf_grow(buf, len + cnt * (the_hash_algo->hexsz + 3));
 	for (;;) {
 		/* step 1: run to the next '$' */
 		dollar = memchr(src, '$', len);
@@ -1510,7 +1510,7 @@ struct ident_filter {
 	struct stream_filter filter;
 	struct strbuf left;
 	int state;
-	char ident[45]; /* ": x40 $" */
+	char ident[GIT_MAX_HEXSZ + 5]; /* ": x40 $" */
 };
 
 static int is_foreign_ident(const char *str)
@@ -1635,12 +1635,12 @@ static struct stream_filter_vtbl ident_vtbl = {
 	ident_free_fn,
 };
 
-static struct stream_filter *ident_filter(const unsigned char *sha1)
+static struct stream_filter *ident_filter(const struct object_id *oid)
 {
 	struct ident_filter *ident = xmalloc(sizeof(*ident));
 
 	xsnprintf(ident->ident, sizeof(ident->ident),
-		  ": %s $", sha1_to_hex(sha1));
+		  ": %s $", oid_to_hex(oid));
 	strbuf_init(&ident->left, 0);
 	ident->filter.vtbl = &ident_vtbl;
 	ident->state = 0;
@@ -1655,7 +1655,7 @@ static struct stream_filter *ident_filter(const unsigned char *sha1)
  * Note that you would be crazy to set CRLF, smuge/clean or ident to a
  * large binary blob you would want us not to slurp into the memory!
  */
-struct stream_filter *get_stream_filter(const char *path, const unsigned char *sha1)
+struct stream_filter *get_stream_filter(const char *path, const struct object_id *oid)
 {
 	struct conv_attrs ca;
 	struct stream_filter *filter = NULL;
@@ -1668,7 +1668,7 @@ struct stream_filter *get_stream_filter(const char *path, const unsigned char *s
 		return NULL;
 
 	if (ca.ident)
-		filter = ident_filter(sha1);
+		filter = ident_filter(oid);
 
 	if (output_eol(ca.crlf_action) == EOL_CRLF)
 		filter = cascade_filter(filter, lf_to_crlf_filter());
diff --git a/convert.h b/convert.h
index 65ab3e5167..2e9b4f49cc 100644
--- a/convert.h
+++ b/convert.h
@@ -93,7 +93,7 @@ extern int would_convert_to_git_filter_fd(const char *path);
 
 struct stream_filter; /* opaque */
 
-extern struct stream_filter *get_stream_filter(const char *path, const unsigned char *);
+extern struct stream_filter *get_stream_filter(const char *path, const struct object_id *);
 extern void free_stream_filter(struct stream_filter *);
 extern int is_null_stream_filter(struct stream_filter *);
 
diff --git a/entry.c b/entry.c
index 3f21d2c913..49b83f4a97 100644
--- a/entry.c
+++ b/entry.c
@@ -266,7 +266,7 @@ static int write_entry(struct cache_entry *ce,
 
 	if (ce_mode_s_ifmt == S_IFREG) {
 		struct stream_filter *filter = get_stream_filter(ce->name,
-								 ce->oid.hash);
+								 &ce->oid);
 		if (filter &&
 		    !streaming_write_entry(ce, path, filter,
 					   state, to_tempfile,
Previous: brian m. carlsonNext: brian m. carlson
Message 23 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.