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>
This commit is contained in:
brian m. carlson
2018-03-12 02:27:45 +00:00
committed by Junio C Hamano
parent 4310b0c441
commit 7984f23833
2 changed files with 15 additions and 4 deletions

View File

@ -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;