summaryrefslogtreecommitdiff
path: root/streaming.c
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2018-03-12 02:27:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-14 16:23:49 (GMT)
commit7984f23833d1c1b8d7d5d863ed8c42b67e0a0fba (patch)
treef48aae71b77a87cdbce8d9c0bfd5bc1aa39c42cf /streaming.c
parent4310b0c441e51fbba13888cb1373d27efcc018ef (diff)
downloadgit-7984f23833d1c1b8d7d5d863ed8c42b67e0a0fba.zip
git-7984f23833d1c1b8d7d5d863ed8c42b67e0a0fba.tar.gz
git-7984f23833d1c1b8d7d5d863ed8c42b67e0a0fba.tar.bz2
Convert remaining callers of sha1_object_info_extended to object_id
Convert the remaining caller of sha1_object_info_extended to use struct object_id. Introduce temporaries, which will be removed later, since there is a dependency loop between sha1_object_info_extended and lookup_replace_object_extended. This allows us to convert the code in a piecemeal fashion instead of all at once. 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.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/streaming.c b/streaming.c
index be85507..042d608 100644
--- a/streaming.c
+++ b/streaming.c
@@ -111,10 +111,13 @@ static enum input_source istream_source(const unsigned char *sha1,
{
unsigned long size;
int status;
+ struct object_id oid;
+
+ hashcpy(oid.hash, sha1);
oi->typep = type;
oi->sizep = &size;
- status = sha1_object_info_extended(sha1, oi, 0);
+ status = sha1_object_info_extended(oid.hash, oi, 0);
if (status < 0)
return stream_error;