averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Convert read_mmblob to take struct object_id.

Browse Source 
Since all of its callers have been updated, convert read_mmblob to take
a pointer to struct object_id.

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
2016-09-05 20:08:02 +00:00
committed by Junio C Hamano
parent e910bb1e79
commit d449347d08
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xdiff-interface.c
View File

@@ -178,20 +178,20 @@ int read_mmfile(mmfile_t *ptr, const char *filename)
return 0;
}
void read_mmblob(mmfile_t *ptr, const unsigned char *sha1)
void read_mmblob(mmfile_t *ptr, const struct object_id *oid)
{
unsigned long size;
enum object_type type;
if (!hashcmp(sha1, null_sha1)) {
if (!oidcmp(oid, &null_oid)) {
ptr->ptr = xstrdup("");
ptr->size = 0;
return;
}
ptr->ptr = read_sha1_file(sha1, &type, &size);
ptr->ptr = read_sha1_file(oid->hash, &type, &size);
if (!ptr->ptr || type != OBJ_BLOB)
die("unable to read blob object %s", sha1_to_hex(sha1));
die("unable to read blob object %s", oid_to_hex(oid));
ptr->size = size;
}