Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-object

diff --git a/transport.c b/transport.c
index 6096f8258670cb2d651f73d945f60281883d11d1..b9995306f259da0a929babdfe1fb5b99eaacead8 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -88,7 +88,7 @@ static struct ref *get_refs_from_bundle(struct transport *transport, int for_pus
        for (i = 0; i < data->header.references.nr; i++) {
                struct ref_list_entry *e = data->header.references.list + i;
                struct ref *ref = alloc_ref(e->name);
-               hashcpy(ref->old_oid.hash, e->sha1);
+               oidcpy(&ref->old_oid, &e->oid);
                ref->next = result;
                result = ref;
        }