diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-10-10 11:39:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-10-10 11:39:14 -0700 |
| commit | 3df51ea0a5ef88b801ab30ca28f159b898183926 (patch) | |
| tree | 507fff30db4437ebbe15b2e125b1598c314b2748 /object-file.c | |
| parent | 3a06386e314565108ad56a9bdb8f7b80ac52fb69 (diff) | |
| parent | 9eb5419799f08402ee3bd185c2d2c50ded669b06 (diff) | |
| download | git-3df51ea0a5ef88b801ab30ca28f159b898183926.tar.gz | |
Merge branch 'eb/limit-bulk-checkin-to-blobs'
The "streaming" interface used for bulk-checkin codepath has been
narrowed to take only blob objects for now, with no real loss of
functionality.
* eb/limit-bulk-checkin-to-blobs:
bulk-checkin: only support blobs in index_bulk_checkin
Diffstat (limited to 'object-file.c')
| -rw-r--r-- | object-file.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/object-file.c b/object-file.c index 7dc0c4bfbb..7c7afe5793 100644 --- a/object-file.c +++ b/object-file.c @@ -2446,11 +2446,11 @@ static int index_core(struct index_state *istate, * 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(struct object_id *oid, int fd, size_t size, - enum object_type type, const char *path, - unsigned flags) +static int index_blob_stream(struct object_id *oid, int fd, size_t size, + const char *path, + unsigned flags) { - return index_bulk_checkin(oid, fd, size, type, path, flags); + return index_blob_bulk_checkin(oid, fd, size, path, flags); } int index_fd(struct index_state *istate, struct object_id *oid, @@ -2472,8 +2472,8 @@ int index_fd(struct index_state *istate, struct object_id *oid, ret = index_core(istate, oid, fd, xsize_t(st->st_size), type, path, flags); else - ret = index_stream(oid, fd, xsize_t(st->st_size), type, path, - flags); + ret = index_blob_stream(oid, fd, xsize_t(st->st_size), path, + flags); close(fd); return ret; } |