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

[PATCH v4 04/12] parse_fetch: convert to use struct object_id

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Nov 10, 2015, 02:22 UTC
Message-ID
<1447122150-672570-5-git-send-email-sandals@crustytoothpaste.net>
In-Reply-To
<1447122150-672570-1-git-send-email-sandals@crustytoothpaste.net>

Convert the parse_fetch function to use struct object_id. Remove the strlen check as get_oid_hex will fail safely on receiving a too-short NUL-terminated string.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 remote-curl.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/remote-curl.c b/remote-curl.c
index bc3af79e..f404faf0 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -803,19 +803,19 @@ static void parse_fetch(struct strbuf *buf)
 		if (skip_prefix(buf->buf, "fetch ", &p)) {
 			const char *name;
 			struct ref *ref;
-			unsigned char old_sha1[20];
+			struct object_id old_oid;
 
-			if (strlen(p) < 40 || get_sha1_hex(p, old_sha1))
+			if (get_oid_hex(p, &old_oid))
 				die("protocol error: expected sha/ref, got %s'", p);
-			if (p[40] == ' ')
-				name = p + 41;
-			else if (!p[40])
+			if (p[GIT_SHA1_HEXSZ] == ' ')
+				name = p + GIT_SHA1_HEXSZ + 1;
+			else if (!p[GIT_SHA1_HEXSZ])
 				name = "";
 			else
 				die("protocol error: expected sha/ref, got %s'", p);
 
 			ref = alloc_ref(name);
-			hashcpy(ref->old_oid.hash, old_sha1);
+			oidcpy(&ref->old_oid, &old_oid);
 
 			*list = ref;
 			list = &ref->next;

-- 
2.6.2.409.gb049f0a
Previous: brian m. carlsonNext: brian m. carlson
Message 5 of 15 in “object_id part 2”
  1. 00/12 object_id part 2brian m. carlson, Nov 10, 2015
  2. 01/12 sha1_file: introduce has_object_file helper.brian m. carlson, Nov 10, 2015
  3. 02/12 Convert struct ref to use object_id.brian m. carlson, Nov 10, 2015
  4. 03/12 add_sought_entry_mem: convert to struct object_idbrian m. carlson, Nov 10, 2015
  5. 04/12 parse_fetch: convert to use struct object_idbrian m. carlson, Nov 10, 2015
  6. 05/12 get_remote_heads: convert to struct object_idbrian m. carlson, Nov 10, 2015
  7. 06/12 push_refs_with_export: convert to struct object_idbrian m. carlson, Nov 10, 2015
  8. 07/12 ref_newer: convert to use struct object_idbrian m. carlson, Nov 10, 2015
  9. 08/12 object: introduce get_object_hash macro.brian m. carlson, Nov 10, 2015
  10. 09/12 Add several uses of get_object_hash.brian m. carlson, Nov 10, 2015
  11. Jeff KingNov 20, 2015
  12. brian m. carlsonNov 20, 2015
  13. 10/12 Convert struct object to object_idbrian m. carlson, Nov 10, 2015
  14. 11/12 Remove get_object_hash.brian m. carlson, Nov 10, 2015
  15. 12/12 remote: convert functions to struct object_idbrian m. carlson, Nov 10, 2015

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.