diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-01 05:28:55 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-02 04:46:41 +0300 |
| commit | fb4e352b4082a447c089151b1f2662844bda0354 (patch) | |
| tree | 7912b32ed2900bb792d7f0173324f983189bfd7c | |
| parent | 1b283377b18bc1e363005729b025a88b36084c4e (diff) | |
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>
| -rw-r--r-- | builtin/diff.c | 2 | ||||
| -rw-r--r-- | reflog-walk.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/diff.c b/builtin/diff.c index d184aafab9..a25b4e4ae6 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 99679f5825..c8fdf051d2 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)) { /* 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); |