diff options
| author |  Patryk Obara <patryk.obara@gmail.com> | 2017-08-20 22:09:31 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-08-20 21:53:20 -0700 |
| commit | 7d5e1dc333e9dc2493405c7c6d74f0c0d8b93455 (patch) | |
| tree | 06b346aec7ab1e3a28deba136f37295be3841d3f /sha1_file.c | |
| parent | sha1_file: convert hash_sha1_file_literally to struct object_id (diff) | |
| download | tgif-7d5e1dc333e9dc2493405c7c6d74f0c0d8b93455.tar.xz | |
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>
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sha1_file.c b/sha1_file.c index c9a230a1e2..103acfcb77 100644 --- 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. */ -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) { - 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, @@ -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_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; |