diff options
| author |  brian m. carlson <sandals@crustytoothpaste.net> | 2016-04-17 23:10:37 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-04-19 15:30:19 -0700 |
| commit | c9baaf9db99dc9f66d9674ab5d467b73f36ab1bf (patch) | |
| tree | eb85bca9554249c652a8fac5b8ca41fbfa3be9fe /test-match-trees.c | |
| parent | sha1-name: introduce a get_oid() function (diff) | |
| download | tgif-c9baaf9db99dc9f66d9674ab5d467b73f36ab1bf.tar.xz | |
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>
Diffstat (limited to 'test-match-trees.c')
| -rw-r--r-- | test-match-trees.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test-match-trees.c b/test-match-trees.c index 109f03e711..a4eea75a15 100644 --- a/test-match-trees.c +++ b/test-match-trees.c @@ -3,22 +3,22 @@ int main(int ac, char **av) { - unsigned char hash1[20], hash2[20], shifted[20]; + struct object_id hash1, hash2, shifted; struct tree *one, *two; - if (get_sha1(av[1], hash1)) + if (get_oid(av[1], &hash1)) die("cannot parse %s as an object name", av[1]); - if (get_sha1(av[2], hash2)) + if (get_oid(av[2], &hash2)) die("cannot parse %s as an object name", av[2]); - one = parse_tree_indirect(hash1); + one = parse_tree_indirect(hash1.hash); if (!one) die("not a tree-ish %s", av[1]); - two = parse_tree_indirect(hash2); + two = parse_tree_indirect(hash2.hash); if (!two) die("not a tree-ish %s", av[2]); - shift_tree(one->object.oid.hash, two->object.oid.hash, shifted, -1); - printf("shifted: %s\n", sha1_to_hex(shifted)); + shift_tree(one->object.oid.hash, two->object.oid.hash, shifted.hash, -1); + printf("shifted: %s\n", oid_to_hex(&shifted)); exit(0); } |