refs: convert resolve_refdup and refs_resolve_refdup to struct object_id

diff --git a/bulk-checkin.c b/bulk-checkin.c
index ddb6070c4c24653a4fa8699251d11626880c2e5c..3310fd210a151545076169b45f5555b52acbbf9d 100644 (file)
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -6,6 +6,7 @@
 #include "csum-file.h"
 #include "pack.h"
 #include "strbuf.h"
+#include "packfile.h"
 
 static struct bulk_checkin_state {
        unsigned plugged:1;
@@ -69,7 +70,7 @@ static int already_written(struct bulk_checkin_state *state, unsigned char sha1[
 
        /* Might want to keep the list sorted */
        for (i = 0; i < state->nr_written; i++)
-               if (!hashcmp(state->written[i]->sha1, sha1))
+               if (!hashcmp(state->written[i]->oid.hash, sha1))
                        return 1;
 
        /* This is a new object we need to keep */
@@ -114,7 +115,10 @@ static int stream_to_pack(struct bulk_checkin_state *state,
 
                if (size && !s.avail_in) {
                        ssize_t rsize = size < sizeof(ibuf) ? size : sizeof(ibuf);
-                       if (read_in_full(fd, ibuf, rsize) != rsize)
+                       ssize_t read_result = read_in_full(fd, ibuf, rsize);
+                       if (read_result < 0)
+                               die_errno("failed to read from '%s'", path);
+                       if (read_result != rsize)
                                die("failed to read %d bytes from '%s'",
                                    (int)rsize, path);
                        offset += rsize;
@@ -242,7 +246,7 @@ static int deflate_to_pack(struct bulk_checkin_state *state,
                state->offset = checkpoint.offset;
                free(idx);
        } else {
-               hashcpy(idx->sha1, result_sha1);
+               hashcpy(idx->oid.hash, result_sha1);
                ALLOC_GROW(state->written,
                           state->nr_written + 1,
                           state->alloc_written);