a9dbc17910
Convert parse_tree_indirect to take a pointer to struct object_id. Update all the callers. This transformation was achieved using the following semantic patch and manual updates to the declaration and definition. Update builtin/checkout.c manually as well, since it uses a ternary expression not handled by the semantic patch. @@ expression E1; @@ - parse_tree_indirect(E1.hash) + parse_tree_indirect(&E1) @@ expression E1; @@ - parse_tree_indirect(E1->hash) + parse_tree_indirect(E1) Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
27 lines
619 B
C
27 lines
619 B
C
#include "cache.h"
|
|
#include "tree.h"
|
|
|
|
int cmd_main(int ac, const char **av)
|
|
{
|
|
struct object_id hash1, hash2, shifted;
|
|
struct tree *one, *two;
|
|
|
|
setup_git_directory();
|
|
|
|
if (get_oid(av[1], &hash1))
|
|
die("cannot parse %s as an object name", av[1]);
|
|
if (get_oid(av[2], &hash2))
|
|
die("cannot parse %s as an object name", av[2]);
|
|
one = parse_tree_indirect(&hash1);
|
|
if (!one)
|
|
die("not a tree-ish %s", av[1]);
|
|
two = parse_tree_indirect(&hash2);
|
|
if (!two)
|
|
die("not a tree-ish %s", av[2]);
|
|
|
|
shift_tree(&one->object.oid, &two->object.oid, &shifted, -1);
|
|
printf("shifted: %s\n", oid_to_hex(&shifted));
|
|
|
|
exit(0);
|
|
}
|