Merge branch 'bc/hash-transition-interop-part-1'

[thirdparty/git.git] / dir.c

diff --git a/dir.c b/dir.c
index d81b5df8030f55cab6206d12a4b5723253ceaf69..c617dc763bd313555d0c358dc4cb49aabd05fa5c 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -3344,7 +3344,7 @@ static void read_oid(size_t pos, void *cb)
                rd->data = rd->end + 1;
                return;
        }
-       hashcpy(ud->exclude_oid.hash, rd->data);
+       oidread(&ud->exclude_oid, rd->data);
        rd->data += the_hash_algo->rawsz;
 }
 
@@ -3352,7 +3352,7 @@ static void load_oid_stat(struct oid_stat *oid_stat, const unsigned char *data,
                          const unsigned char *sha1)
 {
        stat_data_from_disk(&oid_stat->stat, data);
-       hashcpy(oid_stat->oid.hash, sha1);
+       oidread(&oid_stat->oid, sha1);
        oid_stat->valid = 1;
 }
 
@@ -3558,7 +3558,7 @@ static void connect_wt_gitdir_in_nested(const char *sub_worktree,
                         */
                        i++;
 
-               sub = submodule_from_path(&subrepo, &null_oid, ce->name);
+               sub = submodule_from_path(&subrepo, null_oid(), ce->name);
                if (!sub || !is_submodule_active(&subrepo, ce->name))
                        /* .gitmodules broken or inactive sub */
                        continue;