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

[brian m. carlson]

On Tue, May 02, 2017 at 11:05:14AM -0700, Brandon Williams wrote:
> On 05/01, brian m. carlson wrote:
> > -   if (!logobj && commit_reflog->recno >= 0 && 
> > is_null_sha1(reflog->ooid.hash)) {
> > +   if (!logobj && commit_reflog->recno >= 0 && is_null_oid(>ooid)) 
> > {
> 
> Not relevant to this series but I was confused for a second seeing
> 'ooid' as I have no clue what that means :)

These were originally nsha1 and osha1, now noid and ooid.  They are,
respectively, the new and old object IDs.  We've used those in various
places around the codebase.
-- 
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: https://keybase.io/bk2204


signature.asc
Description: PGP signature

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

[Brandon Williams]

On 05/01, brian m. carlson wrote:
> 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 
> ---
>  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([blobs].oid, >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(>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 = _reflog->reflogs->items[commit_reflog->recno];
>   logobj = parse_object(reflog->noid.hash);

-- 
Brandon Williams