test-match-trees: convert to use struct object_id
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
Apr 17, 2016 at 23:10 UTC
c9baaf9db99dc9f66d9674ab5d467b73f36ab1bf
1 file changed
+7
-7
test-match-trees.c
+7
-7
@@ -3,22 +3,22 @@
3
4
int main(int ac, char **av)
5
{
6
- unsigned char hash1[20], hash2[20], shifted[20];
6
+ struct object_id hash1, hash2, shifted;
7
struct tree *one, *two;
8
9
- if (get_sha1(av[1], hash1))
9
+ if (get_oid(av[1], &hash1))
10
die("cannot parse %s as an object name", av[1]);
11
- if (get_sha1(av[2], hash2))
11
+ if (get_oid(av[2], &hash2))
12
die("cannot parse %s as an object name", av[2]);
13
- one = parse_tree_indirect(hash1);
13
+ one = parse_tree_indirect(hash1.hash);
14
if (!one)
15
die("not a tree-ish %s", av[1]);
16
- two = parse_tree_indirect(hash2);
16
+ two = parse_tree_indirect(hash2.hash);
17
if (!two)
18
die("not a tree-ish %s", av[2]);
19
20
- shift_tree(one->object.oid.hash, two->object.oid.hash, shifted, -1);
21
- printf("shifted: %s\n", sha1_to_hex(shifted));
20
+ shift_tree(one->object.oid.hash, two->object.oid.hash, shifted.hash, -1);
21
+ printf("shifted: %s\n", oid_to_hex(&shifted));
22
23
exit(0);
24
}