summaryrefslogtreecommitdiff
path: root/streaming.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2018-03-12 02:27:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-14 16:23:49 (GMT)
commitef7b5195f1ee8ceef41fb2f03a46248ad7747d69 (patch)
tree1edce34a072ce72c3ac1adf745beddb4f03b418d /streaming.c
parent17e65451e305b7501fddec35125bf5d39a4cdcac (diff)
downloadgit-ef7b5195f1ee8ceef41fb2f03a46248ad7747d69.zip
git-ef7b5195f1ee8ceef41fb2f03a46248ad7747d69.tar.gz
git-ef7b5195f1ee8ceef41fb2f03a46248ad7747d69.tar.bz2
streaming: convert open_istream to use struct object_id
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'streaming.c')
-rw-r--r--streaming.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/streaming.c b/streaming.c
index 5892b50..be85507 100644
--- a/streaming.c
+++ b/streaming.c
@@ -130,14 +130,14 @@ static enum input_source istream_source(const unsigned char *sha1,
}
}
-struct git_istream *open_istream(const unsigned char *sha1,
+struct git_istream *open_istream(const struct object_id *oid,
enum object_type *type,
unsigned long *size,
struct stream_filter *filter)
{
struct git_istream *st;
struct object_info oi = OBJECT_INFO_INIT;
- const unsigned char *real = lookup_replace_object(sha1);
+ const unsigned char *real = lookup_replace_object(oid->hash);
enum input_source src = istream_source(real, type, &oi);
if (src < 0)
@@ -507,7 +507,7 @@ int stream_blob_to_fd(int fd, const struct object_id *oid, struct stream_filter
ssize_t kept = 0;
int result = -1;
- st = open_istream(oid->hash, &type, &sz, filter);
+ st = open_istream(oid, &type, &sz, filter);
if (!st) {
if (filter)
free_stream_filter(filter);