builtin/merge-tree: convert remaining caller of get_sha1 to object_id
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Jul 13, 2017 at 23:49 UTC
d1a35e5c93eb57abd1133a8c55ba961cc55268a6
1 file changed
+3
-3
builtin/merge-tree.c
+3
-3
@@ -347,12 +347,12 @@ static void merge_trees(struct tree_desc t[3], const char *base)
347
348
static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)
349
{
350
- unsigned char sha1[20];
350
+ struct object_id oid;
351
void *buf;
352
353
- if (get_sha1(rev, sha1))
353
+ if (get_oid(rev, &oid))
354
die("unknown rev %s", rev);
355
- buf = fill_tree_descriptor(desc, sha1);
355
+ buf = fill_tree_descriptor(desc, oid.hash);
356
if (!buf)
357
die("%s is not a tree", rev);
358
return buf;