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

[PATCH v3 24/25] refs: convert read_raw_ref backends to struct object_id

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Oct 15, 2017, 22:07 UTC
Message-ID
<20171015220712.97308-25-sandals@crustytoothpaste.net>
In-Reply-To
<20171015220712.97308-1-sandals@crustytoothpaste.net>

Convert the unsigned char * parameter to struct object_id * for files_read_raw_ref and packed_read_raw_ref. Update the documentation. Switch from using get_sha1_hex and a hard-coded 40 to using parse_oid_hex.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 refs.c                |  8 ++++----
 refs/files-backend.c  | 13 +++++++------
 refs/packed-backend.c |  4 ++--
 refs/refs-internal.h  | 10 +++++-----
 4 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/refs.c b/refs.c
index 6546346b6a..62a7621025 100644
--- a/refs.c
+++ b/refs.c
@@ -1382,10 +1382,10 @@ int for_each_rawref(each_ref_fn fn, void *cb_data)
 }
 
 int refs_read_raw_ref(struct ref_store *ref_store,
-		      const char *refname, unsigned char *sha1,
+		      const char *refname, struct object_id *oid,
 		      struct strbuf *referent, unsigned int *type)
 {
-	return ref_store->be->read_raw_ref(ref_store, refname, sha1, referent, type);
+	return ref_store->be->read_raw_ref(ref_store, refname, oid, referent, type);
 }
 
 /* This function needs to return a meaningful errno on failure */
@@ -1428,7 +1428,7 @@ const char *refs_resolve_ref_unsafe(struct ref_store *refs,
 		unsigned int read_flags = 0;
 
 		if (refs_read_raw_ref(refs, refname,
-				      oid->hash, &sb_refname, &read_flags)) {
+				      oid, &sb_refname, &read_flags)) {
 			*flags |= read_flags;
 
 			/* In reading mode, refs must eventually resolve */
@@ -1879,7 +1879,7 @@ int refs_verify_refname_available(struct ref_store *refs,
 		if (skip && string_list_has_string(skip, dirname.buf))
 			continue;
 
-		if (!refs_read_raw_ref(refs, dirname.buf, oid.hash, &referent, &type)) {
+		if (!refs_read_raw_ref(refs, dirname.buf, &oid, &referent, &type)) {
 			strbuf_addf(err, "'%s' exists; cannot create '%s'",
 				    dirname.buf, refname);
 			goto cleanup;
diff --git a/refs/files-backend.c b/refs/files-backend.c
index 8bf2ef8a77..c1626490c2 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -261,7 +261,7 @@ static struct ref_cache *get_loose_ref_cache(struct files_ref_store *refs)
 }
 
 static int files_read_raw_ref(struct ref_store *ref_store,
-			      const char *refname, unsigned char *sha1,
+			      const char *refname, struct object_id *oid,
 			      struct strbuf *referent, unsigned int *type)
 {
 	struct files_ref_store *refs =
@@ -270,6 +270,7 @@ static int files_read_raw_ref(struct ref_store *ref_store,
 	struct strbuf sb_path = STRBUF_INIT;
 	const char *path;
 	const char *buf;
+	const char *p;
 	struct stat st;
 	int fd;
 	int ret = -1;
@@ -304,7 +305,7 @@ static int files_read_raw_ref(struct ref_store *ref_store,
 		if (errno != ENOENT)
 			goto out;
 		if (refs_read_raw_ref(refs->packed_ref_store, refname,
-				      sha1, referent, type)) {
+				      oid, referent, type)) {
 			errno = ENOENT;
 			goto out;
 		}
@@ -344,7 +345,7 @@ static int files_read_raw_ref(struct ref_store *ref_store,
 		 * packed ref:
 		 */
 		if (refs_read_raw_ref(refs->packed_ref_store, refname,
-				      sha1, referent, type)) {
+				      oid, referent, type)) {
 			errno = EISDIR;
 			goto out;
 		}
@@ -390,8 +391,8 @@ static int files_read_raw_ref(struct ref_store *ref_store,
 	 * Please note that FETCH_HEAD has additional
 	 * data after the sha.
 	 */
-	if (get_sha1_hex(buf, sha1) ||
-	    (buf[40] != '\0' && !isspace(buf[40]))) {
+	if (parse_oid_hex(buf, oid, &p) ||
+	    (*p != '\0' && !isspace(*p))) {
 		*type |= REF_ISBROKEN;
 		errno = EINVAL;
 		goto out;
@@ -545,7 +546,7 @@ static int lock_raw_ref(struct files_ref_store *refs,
 	 */
 
 	if (files_read_raw_ref(&refs->base, refname,
-			       lock->old_oid.hash, referent, type)) {
+			       &lock->old_oid, referent, type)) {
 		if (errno == ENOENT) {
 			if (mustexist) {
 				/* Garden variety missing reference. */
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index b7652738be..74f1dea0f4 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -716,7 +716,7 @@ static struct snapshot *get_snapshot(struct packed_ref_store *refs)
 }
 
 static int packed_read_raw_ref(struct ref_store *ref_store,
-			       const char *refname, unsigned char *sha1,
+			       const char *refname, struct object_id *oid,
 			       struct strbuf *referent, unsigned int *type)
 {
 	struct packed_ref_store *refs =
@@ -734,7 +734,7 @@ static int packed_read_raw_ref(struct ref_store *ref_store,
 		return -1;
 	}
 
-	if (get_sha1_hex(rec, sha1))
+	if (get_oid_hex(rec, oid))
 		die_invalid_line(refs->path, rec, snapshot->eof - rec);
 
 	*type = REF_ISPACKED;
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 54059c1daf..b0f3e300c7 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -181,7 +181,7 @@ struct ref_update {
 };
 
 int refs_read_raw_ref(struct ref_store *ref_store,
-		      const char *refname, unsigned char *sha1,
+		      const char *refname, struct object_id *oid,
 		      struct strbuf *referent, unsigned int *type);
 
 /*
@@ -619,13 +619,13 @@ typedef int reflog_expire_fn(struct ref_store *ref_store,
  * Read a reference from the specified reference store, non-recursively.
  * Set type to describe the reference, and:
  *
- * - If refname is the name of a normal reference, fill in sha1
+ * - If refname is the name of a normal reference, fill in oid
  *   (leaving referent unchanged).
  *
  * - If refname is the name of a symbolic reference, write the full
  *   name of the reference to which it refers (e.g.
  *   "refs/heads/master") to referent and set the REF_ISSYMREF bit in
- *   type (leaving sha1 unchanged). The caller is responsible for
+ *   type (leaving oid unchanged). The caller is responsible for
  *   validating that referent is a valid reference name.
  *
  * WARNING: refname might be used as part of a filename, so it is
@@ -637,7 +637,7 @@ typedef int reflog_expire_fn(struct ref_store *ref_store,
  *
  * Return 0 on success. If the ref doesn't exist, set errno to ENOENT
  * and return -1. If the ref exists but is neither a symbolic ref nor
- * a sha1, it is broken; set REF_ISBROKEN in type, set errno to
+ * an object ID, it is broken; set REF_ISBROKEN in type, set errno to
  * EINVAL, and return -1. If there is another error reading the ref,
  * set errno appropriately and return -1.
  *
@@ -654,7 +654,7 @@ typedef int reflog_expire_fn(struct ref_store *ref_store,
  *   refname will still be valid and unchanged.
  */
 typedef int read_raw_ref_fn(struct ref_store *ref_store,
-			    const char *refname, unsigned char *sha1,
+			    const char *refname, struct object_id *oid,
 			    struct strbuf *referent, unsigned int *type);
 
 struct ref_storage_be {

-- 
2.15.0.rc0.271.g36b669edcc
Previous: brian m. carlsonNext: brian m. carlson
Message 13 of 30 in “object_id part 10”
  1. 00/25 object_id part 10brian m. carlson, Oct 15, 2017
  2. 02/25 refs/files-backend: convert struct ref_to_prune to object_idbrian m. carlson, Oct 15, 2017
  3. 05/25 refs: prevent accidental NULL dereference in write_pseudorefbrian m. carlson, Oct 15, 2017
  4. 06/25 refs: update ref transactions to use struct object_idbrian m. carlson, Oct 15, 2017
  5. 07/25 Convert check_connected to use struct object_idbrian m. carlson, Oct 15, 2017
  6. 08/25 refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson, Oct 15, 2017
  7. 10/25 refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson, Oct 15, 2017
  8. 11/25 builtin/reflog: convert remaining unsigned char uses to object_idbrian m. carlson, Oct 15, 2017
  9. 15/25 refs: convert peel_ref to struct object_idbrian m. carlson, Oct 15, 2017
  10. 14/25 builtin/pack-objects: convert to struct object_idbrian m. carlson, Oct 15, 2017
  11. 18/25 sha1_file: convert index_path and index_fd to struct object_idbrian m. carlson, Oct 15, 2017
  12. 23/25 refs: convert peel_object to struct object_idbrian m. carlson, Oct 15, 2017
  13. 24/25 refs: convert read_raw_ref backends to struct object_idbrian m. carlson, Oct 15, 2017
  14. 19/25 Convert remaining callers of resolve_gitlink_ref to object_idbrian m. carlson, Oct 15, 2017
  15. 25/25 refs/files-backend: convert static functions to object_idbrian m. carlson, Oct 15, 2017
  16. 20/25 refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson, Oct 15, 2017
  17. 21/25 worktree: convert struct worktree to object_idbrian m. carlson, Oct 15, 2017
  18. 17/25 refs: convert reflog_expire parameter to struct object_idbrian m. carlson, Oct 15, 2017
  19. 22/25 refs: convert resolve_ref_unsafe to struct object_idbrian m. carlson, Oct 15, 2017
  20. 16/25 refs: convert read_ref_at to struct object_idbrian m. carlson, Oct 15, 2017
  21. 13/25 pack-bitmap: convert traverse_bitmap_commit_list to object_idbrian m. carlson, Oct 15, 2017
  22. 09/25 refs: convert read_ref and read_ref_full to object_idbrian m. carlson, Oct 15, 2017
  23. 12/25 refs: convert dwim_log to struct object_idbrian m. carlson, Oct 15, 2017
  24. 01/25 walker: convert to struct object_idbrian m. carlson, Oct 15, 2017
  25. 03/25 refs: convert delete_ref and refs_delete_ref to struct object_idbrian m. carlson, Oct 15, 2017
  26. 04/25 refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson, Oct 15, 2017
  27. Junio C HamanoOct 16, 2017
  28. brian m. carlsonOct 16, 2017
  29. Kevin DaudtOct 16, 2017
  30. Junio C HamanoOct 17, 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.