mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert remaining callers of get_sha1 to get_oid.

Browse Source 
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
2017-07-13 23:49:27 +00:00
committed by Junio C Hamano
parent c300b1ed5b
commit 15be4a5d38
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/receive-pack.c
View File

@ -919,9 +919,9 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
*/ */
static int head_has_history(void) 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, static const char *push_to_deploy(unsigned char *sha1,

6
mailmap.c
View File

@ -214,17 +214,17 @@ static int read_mailmap_blob(struct string_list *map,
const char *name, const char *name,
char **repo_abbrev) char **repo_abbrev)
{ {
unsigned char sha1[20]; struct object_id oid;
char *buf; char *buf;
unsigned long size; unsigned long size;
enum object_type type; enum object_type type;
if (!name) if (!name)
return 0; return 0;
if (get_sha1(name, sha1) < 0) if (get_oid(name, &oid) < 0)
return 0; return 0;
buf = read_sha1_file(sha1, &type, &size); buf = read_sha1_file(oid.hash, &type, &size);
if (!buf) if (!buf)
return error("unable to read mailmap object at %s", name); return error("unable to read mailmap object at %s", name);
if (type != OBJ_BLOB) if (type != OBJ_BLOB)