Re: [PATCH v2 21/24] refs: convert resolve_ref_unsafe to struct object_id

[Michael Haggerty]

On 10/09/2017 03:11 AM, brian m. carlson wrote:
> Convert resolve_ref_unsafe to take a pointer to struct object_id by
> converting one remaining caller to use struct object_id, converting the
> declaration and definition, and applying the following semantic patch:
> 
> @@
> expression E1, E2, E3, E4;
> @@
> - resolve_ref_unsafe(E1, E2, E3.hash, E4)
> + resolve_ref_unsafe(E1, E2, , E4)
> 
> @@
> expression E1, E2, E3, E4;
> @@
> - resolve_ref_unsafe(E1, E2, E3->hash, E4)
> + resolve_ref_unsafe(E1, E2, E3, E4)
> 
> Signed-off-by: brian m. carlson 
> ---
>  blame.c   |  4 ++--
>  builtin/fsck.c|  2 +-
>  refs.c| 28 ++--
>  refs.h|  4 ++--
>  refs/files-backend.c  |  8 
>  sequencer.c   |  2 +-
>  t/helper/test-ref-store.c |  6 +++---
>  transport-helper.c|  7 +++
>  worktree.c|  2 +-
>  9 files changed, 31 insertions(+), 32 deletions(-)
> 
> [...]
> diff --git a/refs.h b/refs.h
> index bb0dcd97af..4eedc880c6 100644
> --- a/refs.h
> +++ b/refs.h
> @@ -62,10 +62,10 @@ struct worktree;

The docstring above this hunk needs to be adjusted.

>  const char *refs_resolve_ref_unsafe(struct ref_store *refs,
>   const char *refname,
>   int resolve_flags,
> - unsigned char *sha1,
> + struct object_id *oid,
>   int *flags);
>  const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
> -unsigned char *sha1, int *flags);
> +struct object_id *oid, int *flags);
>  
>  char *refs_resolve_refdup(struct ref_store *refs,
> const char *refname, int resolve_flags,
> [...]
Michael

[PATCH v2 21/24] refs: convert resolve_ref_unsafe to struct object_id

[brian m. carlson]

Convert resolve_ref_unsafe to take a pointer to struct object_id by
converting one remaining caller to use struct object_id, converting the
declaration and definition, and applying the following semantic patch:

@@
expression E1, E2, E3, E4;
@@
- resolve_ref_unsafe(E1, E2, E3.hash, E4)
+ resolve_ref_unsafe(E1, E2, , E4)

@@
expression E1, E2, E3, E4;
@@
- resolve_ref_unsafe(E1, E2, E3->hash, E4)
+ resolve_ref_unsafe(E1, E2, E3, E4)

Signed-off-by: brian m. carlson 
---
 blame.c   |  4 ++--
 builtin/fsck.c|  2 +-
 refs.c| 28 ++--
 refs.h|  4 ++--
 refs/files-backend.c  |  8 
 sequencer.c   |  2 +-
 t/helper/test-ref-store.c |  6 +++---
 transport-helper.c|  7 +++
 worktree.c|  2 +-
 9 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/blame.c b/blame.c
index f575e9cbf4..c3060de2f8 100644
--- a/blame.c
+++ b/blame.c
@@ -166,7 +166,7 @@ static struct commit *fake_working_tree_commit(struct 
diff_options *opt,
commit->date = now;
parent_tail = >parents;
 
-   if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, head_oid.hash, 
NULL))
+   if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, _oid, NULL))
die("no such ref: HEAD");
 
parent_tail = append_parent(parent_tail, _oid);
@@ -1689,7 +1689,7 @@ static struct commit *dwim_reverse_initial(struct 
rev_info *revs,
return NULL;
 
/* Do we have HEAD? */
-   if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, head_oid.hash, 
NULL))
+   if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, _oid, NULL))
return NULL;
head_commit = lookup_commit_reference_gently(_oid, 1);
if (!head_commit)
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 56afe405b8..5f91116d73 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -555,7 +555,7 @@ static int fsck_head_link(void)
if (verbose)
fprintf(stderr, "Checking HEAD link\n");
 
-   head_points_at = resolve_ref_unsafe("HEAD", 0, head_oid.hash, NULL);
+   head_points_at = resolve_ref_unsafe("HEAD", 0, _oid, NULL);
if (!head_points_at) {
errors_found |= ERROR_REFS;
return error("Invalid HEAD");
diff --git a/refs.c b/refs.c
index 2fbe9942e2..a030937f77 100644
--- a/refs.c
+++ b/refs.c
@@ -199,7 +199,7 @@ char *refs_resolve_refdup(struct ref_store *refs,
const char *result;
 
result = refs_resolve_ref_unsafe(refs, refname, resolve_flags,
-oid->hash, flags);
+oid, flags);
return xstrdup_or_null(result);
 }
 
@@ -221,7 +221,7 @@ struct ref_filter {
 int refs_read_ref_full(struct ref_store *refs, const char *refname,
   int resolve_flags, struct object_id *oid, int *flags)
 {
-   if (refs_resolve_ref_unsafe(refs, refname, resolve_flags, oid->hash, 
flags))
+   if (refs_resolve_ref_unsafe(refs, refname, resolve_flags, oid, flags))
return 0;
return -1;
 }
@@ -480,7 +480,7 @@ int expand_ref(const char *str, int len, struct object_id 
*oid, char **ref)
strbuf_reset();
strbuf_addf(, *p, len, str);
r = resolve_ref_unsafe(fullref.buf, RESOLVE_REF_READING,
-  this_result->hash, );
+  this_result, );
if (r) {
if (!refs_found++)
*ref = xstrdup(r);
@@ -511,7 +511,7 @@ int dwim_log(const char *str, int len, struct object_id 
*oid, char **log)
strbuf_reset();
strbuf_addf(, *p, len, str);
ref = resolve_ref_unsafe(path.buf, RESOLVE_REF_READING,
-hash.hash, NULL);
+, NULL);
if (!ref)
continue;
if (reflog_exists(path.buf))
@@ -1384,15 +1384,15 @@ int refs_read_raw_ref(struct ref_store *ref_store,
 const char *refs_resolve_ref_unsafe(struct ref_store *refs,
const char *refname,
int resolve_flags,
-   unsigned char *sha1, int *flags)
+   struct object_id *oid, int *flags)
 {
static struct strbuf sb_refname = STRBUF_INIT;
struct object_id unused_oid;
int unused_flags;
int symref_count;
 
-   if (!sha1)
-   sha1 = unused_oid.hash;
+   if (!oid)
+   oid = _oid;
if (!flags)
flags = _flags;
 
@@ -1420,11 +1420,11 @@ const char *refs_resolve_ref_unsafe(struct ref_store 
*refs,
unsigned int read_flags = 0;
 
if