diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-07-14 01:49:19 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-17 22:54:37 +0200 |
| commit | d1a35e5c93eb57abd1133a8c55ba961cc55268a6 (patch) | |
| tree | 0f9dee0419315703ee26fbace34f1b89d2d94a66 /builtin/merge-tree.c | |
| parent | builtin/fsck: convert remaining caller of get_sha1 to object_id (diff) | |
| download | git-d1a35e5c93eb57abd1133a8c55ba961cc55268a6.tar.xz git-d1a35e5c93eb57abd1133a8c55ba961cc55268a6.zip | |
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>
Diffstat (limited to '')
| -rw-r--r-- | builtin/merge-tree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c index bad6735c76..f12da292cf 100644 --- a/builtin/merge-tree.c +++ b/builtin/merge-tree.c @@ -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; |