mirror of
https://github.com/git/git
synced 2024-10-06 00:29:28 +00:00
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>
This commit is contained in:
parent
aca6065c88
commit
d1a35e5c93
|
@ -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)
|
||||
{
|
||||
unsigned char sha1[20];
|
||||
struct object_id oid;
|
||||
void *buf;
|
||||
|
||||
if (get_sha1(rev, sha1))
|
||||
if (get_oid(rev, &oid))
|
||||
die("unknown rev %s", rev);
|
||||
buf = fill_tree_descriptor(desc, sha1);
|
||||
buf = fill_tree_descriptor(desc, oid.hash);
|
||||
if (!buf)
|
||||
die("%s is not a tree", rev);
|
||||
return buf;
|
||||
|
|
Loading…
Reference in a new issue