Re: [PATCH v2 02/53] Clean up outstanding object_id transforms.

From: Brandon Williams <bmwill@google.com>
Date: May 2, 2017, 18:05 UTC
Message-ID: <20170502180514.GC181268@google.com>
In-Reply-To: <20170501022946.258735-3-sandals@crustytoothpaste.net>

On 05/01, brian m. carlson wrote:

Show 33 quoted lines

> The semantic patch for standard object_id transforms found two
> outstanding places where we could make a transformation automatically.
> Apply these changes.
> 
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
>  builtin/diff.c | 2 +-
>  reflog-walk.c  | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/builtin/diff.c b/builtin/diff.c
> index d184aafab..a25b4e4ae 100644
> --- a/builtin/diff.c
> +++ b/builtin/diff.c
> @@ -408,7 +408,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
>  		} else if (obj->type == OBJ_BLOB) {
>  			if (2 <= blobs)
>  				die(_("more than two blobs given: '%s'"), name);
> -			hashcpy(blob[blobs].oid.hash, obj->oid.hash);
> +			oidcpy(&blob[blobs].oid, &obj->oid);
>  			blob[blobs].name = name;
>  			blob[blobs].mode = entry->mode;
>  			blobs++;
> diff --git a/reflog-walk.c b/reflog-walk.c
> index 99679f582..c8fdf051d 100644
> --- a/reflog-walk.c
> +++ b/reflog-walk.c
> @@ -241,7 +241,7 @@ void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit)
>  		logobj = parse_object(reflog->ooid.hash);
>  	} while (commit_reflog->recno && (logobj && logobj->type != OBJ_COMMIT));
>  
> -	if (!logobj && commit_reflog->recno >= 0 && is_null_sha1(reflog->ooid.hash)) {
> +	if (!logobj && commit_reflog->recno >= 0 && is_null_oid(&reflog->ooid)) {

Not relevant to this series but I was confused for a second seeing 'ooid' as I have no clue what that means :)

>  		/* a root commit, but there are still more entries to show */
>  		reflog = &commit_reflog->reflogs->items[commit_reflog->recno];
>  		logobj = parse_object(reflog->noid.hash);

-- 
Brandon Williams