diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-05-06 22:10:29 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-08 15:12:58 +0900 |
| commit | de37d50d76f4cfac2876af8a8ceff0f65b5f27b0 (patch) | |
| tree | b3a13f150f90b0d39cc3e8bf72c830dc66736f19 /sha1_name.c | |
| parent | cf93982faefd3a9a488ea9a68c60e3a81a4e0432 (diff) | |
| download | git-de37d50d76f4cfac2876af8a8ceff0f65b5f27b0.tar.gz git-de37d50d76f4cfac2876af8a8ceff0f65b5f27b0.tar.xz | |
sha1_name: convert internals of peel_onion to object_id
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sha1_name.c b/sha1_name.c index b7e09ac13..72e72ab9a 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -798,7 +798,7 @@ struct object *peel_to_type(const char *name, int namelen, static int peel_onion(const char *name, int len, unsigned char *sha1, unsigned lookup_flags) { - unsigned char outer[20]; + struct object_id outer; const char *sp; unsigned int expected_type = 0; struct object *o; @@ -846,10 +846,10 @@ static int peel_onion(const char *name, int len, unsigned char *sha1, else if (expected_type == OBJ_TREE) lookup_flags |= GET_SHA1_TREEISH; - if (get_sha1_1(name, sp - name - 2, outer, lookup_flags)) + if (get_sha1_1(name, sp - name - 2, outer.hash, lookup_flags)) return -1; - o = parse_object(outer); + o = parse_object(outer.hash); if (!o) return -1; if (!expected_type) { |