diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-07-13 23:49:27 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-17 13:54:51 -0700 |
| commit | 15be4a5d38c3a4408df956845e4c7a8b23920459 (patch) | |
| tree | 0f62ea166d5e312690b789693da55dfe59a0b032 | |
| parent | c300b1ed5b0583aa6a4bc668a5da0ec33f2573fa (diff) | |
| download | git-15be4a5d38c3a4408df956845e4c7a8b23920459.tar.gz | |
Convert remaining callers of get_sha1 to get_oid.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/receive-pack.c | 4 | ||||
| -rw-r--r-- | mailmap.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index cabdc55e09..136c44def7 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -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) |