|
3 | 3 |
|
4 | 4 | int main(int ac, char **av)
|
5 | 5 | {
|
6 |
| - unsigned char hash1[20], hash2[20], shifted[20]; |
| 6 | + struct object_id hash1, hash2, shifted; |
7 | 7 | struct tree *one, *two;
|
8 | 8 |
|
9 |
| - if (get_sha1(av[1], hash1)) |
| 9 | + if (get_oid(av[1], &hash1)) |
10 | 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 | 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 | 14 | if (!one)
|
15 | 15 | die("not a tree-ish %s", av[1]);
|
16 |
| - two = parse_tree_indirect(hash2); |
| 16 | + two = parse_tree_indirect(hash2.hash); |
17 | 17 | if (!two)
|
18 | 18 | die("not a tree-ish %s", av[2]);
|
19 | 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 | 22 |
|
23 | 23 | exit(0);
|
24 | 24 | }
|
0 commit comments