undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/merge-tree: convert remaining caller of get_sha1 to object_id

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:19 +00:00 committed by Junio C Hamano
parent aca6065c88
commit d1a35e5c93
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/merge-tree.c
View File

@ -347,12 +347,12 @@ static void merge_trees(struct tree_desc t[3], const char *base)
static void *get_tree_descriptor(struct tree_desc *desc, const char *rev) static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)
{ {
unsigned char sha1[20]; struct object_id oid;
void *buf; void *buf;
if (get_sha1(rev, sha1)) if (get_oid(rev, &oid))
die("unknown rev %s", rev); die("unknown rev %s", rev);
buf = fill_tree_descriptor(desc, sha1); buf = fill_tree_descriptor(desc, oid.hash);
if (!buf) if (!buf)
die("%s is not a tree", rev); die("%s is not a tree", rev);
return buf; return buf;