refs: convert peel_ref to struct object_id

bk2204 · gitster · commit b420d90980a3 · 2017-10-16T11:05:51.000+09:00
Convert peel_ref (and its corresponding backend) to struct object_id.

This transformation was done with an update to the declaration,
definition, comments, and test helper and the following semantic patch:

@@
expression E1, E2;
@@
- peel_ref(E1, E2.hash)
+ peel_ref(E1, &amp;E2)

@@
expression E1, E2;
@@
- peel_ref(E1, E2-&gt;hash)
+ peel_ref(E1, E2)

Signed-off-by: brian m. carlson &lt;sandals@crustytoothpaste.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/describe.c b/builtin/describe.c
@@ -181,7 +181,7 @@ static int get_name(const char *path, const struct object_id *oid, int flag, voi
 	}
 
 	/* Is it annotated? */
-	if (!peel_ref(path, peeled.hash)) {
+	if (!peel_ref(path, &peeled)) {
 		is_annotated = !!oidcmp(oid, &peeled);
 	} else {
 		oidcpy(&peeled, oid);
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
@@ -562,7 +562,7 @@ static int mark_tagged(const char *path, const struct object_id *oid, int flag,
 
 	if (entry)
 		entry->tagged = 1;
-	if (!peel_ref(path, peeled.hash)) {
+	if (!peel_ref(path, &peeled)) {
 		entry = packlist_find(&to_pack, peeled.hash, NULL);
 		if (entry)
 			entry->tagged = 1;
@@ -2371,7 +2371,7 @@ static int add_ref_tag(const char *path, const struct object_id *oid, int flag,
 	struct object_id peeled;
 
 	if (starts_with(path, "refs/tags/") && /* is a tag? */
-	    !peel_ref(path, peeled.hash)    && /* peelable? */
+	    !peel_ref(path, &peeled)    && /* peelable? */
 	    packlist_find(&to_pack, peeled.hash, NULL))      /* object packed? */
 		add_tag_chain(oid);
 	return 0;
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
@@ -38,7 +38,7 @@ static void show_one(const char *refname, const struct object_id *oid)
 	if (!deref_tags)
 		return;
 
-	if (!peel_ref(refname, peeled.hash)) {
+	if (!peel_ref(refname, &peeled)) {
 		hex = find_unique_abbrev(peeled.hash, abbrev);
 		printf("%s %s^{}\n", hex, refname);
 	}
diff --git a/refs.c b/refs.c
@@ -1697,7 +1697,7 @@ int refs_pack_refs(struct ref_store *refs, unsigned int flags)
 }
 
 int refs_peel_ref(struct ref_store *refs, const char *refname,
-		  unsigned char *sha1)
+		  struct object_id *oid)
 {
 	int flag;
 	struct object_id base;
@@ -1707,20 +1707,20 @@ int refs_peel_ref(struct ref_store *refs, const char *refname,
 
 		if (ref_iterator_peel(current_ref_iter, &peeled))
 			return -1;
-		hashcpy(sha1, peeled.hash);
+		oidcpy(oid, &peeled);
 		return 0;
 	}
 
 	if (refs_read_ref_full(refs, refname,
 			       RESOLVE_REF_READING, &base, &flag))
 		return -1;
 
-	return peel_object(base.hash, sha1);
+	return peel_object(base.hash, oid->hash);
 }
 
-int peel_ref(const char *refname, unsigned char *sha1)
+int peel_ref(const char *refname, struct object_id *oid)
 {
-	return refs_peel_ref(get_main_ref_store(), refname, sha1);
+	return refs_peel_ref(get_main_ref_store(), refname, oid);
 }
 
 int refs_create_symref(struct ref_store *refs,
diff --git a/refs.h b/refs.h
@@ -114,14 +114,14 @@ extern int refs_init_db(struct strbuf *err);
 /*
  * If refname is a non-symbolic reference that refers to a tag object,
  * and the tag can be (recursively) dereferenced to a non-tag object,
- * store the SHA1 of the referred-to object to sha1 and return 0.  If
- * any of these conditions are not met, return a non-zero value.
+ * store the object ID of the referred-to object to oid and return 0.
+ * If any of these conditions are not met, return a non-zero value.
  * Symbolic references are considered unpeelable, even if they
  * ultimately resolve to a peelable tag.
  */
 int refs_peel_ref(struct ref_store *refs, const char *refname,
-		  unsigned char *sha1);
-int peel_ref(const char *refname, unsigned char *sha1);
+		  struct object_id *oid);
+int peel_ref(const char *refname, struct object_id *oid);
 
 /**
  * Resolve refname in the nested "gitlink" repository in the specified
diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c
@@ -72,12 +72,12 @@ static int cmd_pack_refs(struct ref_store *refs, const char **argv)
 static int cmd_peel_ref(struct ref_store *refs, const char **argv)
 {
 	const char *refname = notnull(*argv++, "refname");
-	unsigned char sha1[20];
+	struct object_id oid;
 	int ret;
 
-	ret = refs_peel_ref(refs, refname, sha1);
+	ret = refs_peel_ref(refs, refname, &oid);
 	if (!ret)
-		puts(sha1_to_hex(sha1));
+		puts(oid_to_hex(&oid));
 	return ret;
 }
 
diff --git a/upload-pack.c b/upload-pack.c
@@ -955,7 +955,7 @@ static int send_ref(const char *refname, const struct object_id *oid,
 		packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
 	}
 	capabilities = NULL;
-	if (!peel_ref(refname, peeled.hash))
+	if (!peel_ref(refname, &peeled))
 		packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ static int get_name(const char path, const struct object_id oid, int flag, voi`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`/* Is it annotated? */`
`184`		`- if (!peel_ref(path, peeled.hash)) {`
	`184`	`+ if (!peel_ref(path, &peeled)) {`
`185`	`185`	`is_annotated = !!oidcmp(oid, &peeled);`
`186`	`186`	`} else {`
`187`	`187`	`oidcpy(&peeled, oid);`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ static void show_one(const char refname, const struct object_id oid)`
`38`	`38`	`if (!deref_tags)`
`39`	`39`	`return;`
`40`	`40`
`41`		`- if (!peel_ref(refname, peeled.hash)) {`
	`41`	`+ if (!peel_ref(refname, &peeled)) {`
`42`	`42`	`hex = find_unique_abbrev(peeled.hash, abbrev);`
`43`	`43`	`printf("%s %s^{}\n", hex, refname);`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1697,7 +1697,7 @@ int refs_pack_refs(struct ref_store *refs, unsigned int flags)`
`1697`	`1697`	`}`
`1698`	`1698`
`1699`	`1699`	`int refs_peel_ref(struct ref_store refs, const char refname,`
`1700`		`- unsigned char *sha1)`
	`1700`	`+ struct object_id *oid)`
`1701`	`1701`	`{`
`1702`	`1702`	`int flag;`
`1703`	`1703`	`struct object_id base;`
`@@ -1707,20 +1707,20 @@ int refs_peel_ref(struct ref_store refs, const char refname,`
`1707`	`1707`
`1708`	`1708`	`if (ref_iterator_peel(current_ref_iter, &peeled))`
`1709`	`1709`	`return -1;`
`1710`		`- hashcpy(sha1, peeled.hash);`
	`1710`	`+ oidcpy(oid, &peeled);`
`1711`	`1711`	`return 0;`
`1712`	`1712`	`}`
`1713`	`1713`
`1714`	`1714`	`if (refs_read_ref_full(refs, refname,`
`1715`	`1715`	`RESOLVE_REF_READING, &base, &flag))`
`1716`	`1716`	`return -1;`
`1717`	`1717`
`1718`		`- return peel_object(base.hash, sha1);`
	`1718`	`+ return peel_object(base.hash, oid->hash);`
`1719`	`1719`	`}`
`1720`	`1720`
`1721`		`-int peel_ref(const char refname, unsigned char sha1)`
	`1721`	`+int peel_ref(const char refname, struct object_id oid)`
`1722`	`1722`	`{`
`1723`		`- return refs_peel_ref(get_main_ref_store(), refname, sha1);`
	`1723`	`+ return refs_peel_ref(get_main_ref_store(), refname, oid);`
`1724`	`1724`	`}`
`1725`	`1725`
`1726`	`1726`	`int refs_create_symref(struct ref_store *refs,`
Original file line number	Diff line number	Diff line change
`@@ -72,12 +72,12 @@ static int cmd_pack_refs(struct ref_store refs, const char *argv)`
`72`	`72`	`static int cmd_peel_ref(struct ref_store refs, const char *argv)`
`73`	`73`	`{`
`74`	`74`	`const char refname = notnull(argv++, "refname");`
`75`		`- unsigned char sha1[20];`
	`75`	`+ struct object_id oid;`
`76`	`76`	`int ret;`
`77`	`77`
`78`		`- ret = refs_peel_ref(refs, refname, sha1);`
	`78`	`+ ret = refs_peel_ref(refs, refname, &oid);`
`79`	`79`	`if (!ret)`
`80`		`- puts(sha1_to_hex(sha1));`
	`80`	`+ puts(oid_to_hex(&oid));`
`81`	`81`	`return ret;`
`82`	`82`	`}`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -955,7 +955,7 @@ static int send_ref(const char refname, const struct object_id oid,`
`955`	`955`	`packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);`
`956`	`956`	`}`
`957`	`957`	`capabilities = NULL;`
`958`		`- if (!peel_ref(refname, peeled.hash))`
	`958`	`+ if (!peel_ref(refname, &peeled))`
`959`	`959`	`packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);`
`960`	`960`	`return 0;`
`961`	`961`	`}`