kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
brian m. carlson 2017-05-06 22:10:29 +00:00 committed by Junio C Hamano
parent cf93982fae
commit de37d50d76
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sha1_name.c
View File

@ -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, static int peel_onion(const char *name, int len, unsigned char *sha1,
unsigned lookup_flags) unsigned lookup_flags)
{ {
unsigned char outer[20]; struct object_id outer;
const char *sp; const char *sp;
unsigned int expected_type = 0; unsigned int expected_type = 0;
struct object *o; 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) else if (expected_type == OBJ_TREE)
lookup_flags |= GET_SHA1_TREEISH; 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; return -1;


o = parse_object(outer); o = parse_object(outer.hash);
if (!o) if (!o)
return -1; return -1;
if (!expected_type) { if (!expected_type) {