Merge branch 'nd/worktree-add-lock'

diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 832fd7ed0a2b4d8bff6d6edfadd285e499aa54d5..b8e2e74fe0c5cdefa6ed4d6c309a8bba203cc6e8 100644 (file)
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -131,8 +131,8 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
        const char *dest = NULL;
        int fd[2];
        struct child_process *conn;
-       struct sha1_array extra_have = SHA1_ARRAY_INIT;
-       struct sha1_array shallow = SHA1_ARRAY_INIT;
+       struct oid_array extra_have = OID_ARRAY_INIT;
+       struct oid_array shallow = OID_ARRAY_INIT;
        struct ref *remote_refs, *local_refs;
        int ret;
        int helper_status = 0;