sha1_file: convert index_stream to struct object_id

Signed-off-by: Patryk Obara <patryk.obara@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/sha1_file.c b/sha1_file.c
index c9a230a1e2732846ba935123b7c149278ec98424..103acfcb7744419b582626554c49e12a0ab54b21 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -3655,11 +3655,11 @@ static int index_core(unsigned char *sha1, int fd, size_t size,
  * binary blobs, they generally do not want to get any conversion, and
  * callers should avoid this code path when filters are requested.
  */
  * binary blobs, they generally do not want to get any conversion, and
  * callers should avoid this code path when filters are requested.
  */

-static int index_stream(unsigned char *sha1, int fd, size_t size,
+static int index_stream(struct object_id *oid, int fd, size_t size,

                        enum object_type type, const char *path,
                        unsigned flags)
 {
                        enum object_type type, const char *path,
                        unsigned flags)
 {

-       return index_bulk_checkin(sha1, fd, size, type, path, flags);
+       return index_bulk_checkin(oid->hash, fd, size, type, path, flags);

 }
 
 int index_fd(struct object_id *oid, int fd, struct stat *st,
 }
 
 int index_fd(struct object_id *oid, int fd, struct stat *st,


@@ -3680,7 +3680,7 @@ int index_fd(struct object_id *oid, int fd, struct stat *st,
                ret = index_core(oid->hash, fd, xsize_t(st->st_size), type, path,
                                 flags);
        else
                ret = index_core(oid->hash, fd, xsize_t(st->st_size), type, path,
                                 flags);
        else

-               ret = index_stream(oid->hash, fd, xsize_t(st->st_size), type, path,
+               ret = index_stream(oid, fd, xsize_t(st->st_size), type, path,

                                   flags);
        close(fd);
        return ret;
                                   flags);
        close(fd);
        return ret;