Clean up outstanding object_id transforms.
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
May 1, 2017 at 02:28 UTC
fb4e352b4082a447c089151b1f2662844bda0354
2 files changed
+2
-2
builtin/diff.c
+1
-1
@@ -408,7 +408,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
408
} else if (obj->type == OBJ_BLOB) {
409
if (2 <= blobs)
410
die(_("more than two blobs given: '%s'"), name);
411
- hashcpy(blob[blobs].oid.hash, obj->oid.hash);
411
+ oidcpy(&blob[blobs].oid, &obj->oid);
412
blob[blobs].name = name;
413
blob[blobs].mode = entry->mode;
414
blobs++;
reflog-walk.c
+1
-1
@@ -241,7 +241,7 @@ void fake_reflog_parent(struct reflog_walk_info *info, struct commit *commit)
241
logobj = parse_object(reflog->ooid.hash);
242
} while (commit_reflog->recno && (logobj && logobj->type != OBJ_COMMIT));
243
244
- if (!logobj && commit_reflog->recno >= 0 && is_null_sha1(reflog->ooid.hash)) {
244
+ if (!logobj && commit_reflog->recno >= 0 && is_null_oid(&reflog->ooid)) {
245
/* a root commit, but there are still more entries to show */
246
reflog = &commit_reflog->reflogs->items[commit_reflog->recno];
247
logobj = parse_object(reflog->noid.hash);