Commit 15be4a5d authored by brian m. carlson's avatar brian m. carlson Committed by Junio C Hamano

Convert remaining callers of get_sha1 to get_oid.

Signed-off-by: brian m. carlson's avatarbrian m. carlson <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent c300b1ed
......@@ -919,9 +919,9 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
*/
static int head_has_history(void)
{
unsigned char sha1[20];
struct object_id oid;
return !get_sha1("HEAD", sha1);
return !get_oid("HEAD", &oid);
}
static const char *push_to_deploy(unsigned char *sha1,
......
......@@ -214,17 +214,17 @@ static int read_mailmap_blob(struct string_list *map,
const char *name,
char **repo_abbrev)
{
unsigned char sha1[20];
struct object_id oid;
char *buf;
unsigned long size;
enum object_type type;
if (!name)
return 0;
if (get_sha1(name, sha1) < 0)
if (get_oid(name, &oid) < 0)
return 0;
buf = read_sha1_file(sha1, &type, &size);
buf = read_sha1_file(oid.hash, &type, &size);
if (!buf)
return error("unable to read mailmap object at %s", name);
if (type != OBJ_BLOB)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment