e7dca80692
* ab/remove-implicit-use-of-the-repository: libs: use "struct repository *" argument, not "the_repository" post-cocci: adjust comments for recent repo_* migration cocci: apply the "revision.h" part of "the_repository.pending" cocci: apply the "rerere.h" part of "the_repository.pending" cocci: apply the "refs.h" part of "the_repository.pending" cocci: apply the "promisor-remote.h" part of "the_repository.pending" cocci: apply the "packfile.h" part of "the_repository.pending" cocci: apply the "pretty.h" part of "the_repository.pending" cocci: apply the "object-store.h" part of "the_repository.pending" cocci: apply the "diff.h" part of "the_repository.pending" cocci: apply the "commit.h" part of "the_repository.pending" cocci: apply the "commit-reach.h" part of "the_repository.pending" cocci: apply the "cache.h" part of "the_repository.pending" cocci: add missing "the_repository" macros to "pending" cocci: sort "the_repository" rules by header cocci: fix incorrect & verbose "the_repository" rules cocci: remove dead rule from "the_repository.pending.cocci"
30 lines
745 B
C
30 lines
745 B
C
#include "test-tool.h"
|
|
#include "cache.h"
|
|
#include "hex.h"
|
|
#include "setup.h"
|
|
#include "tree.h"
|
|
|
|
int cmd__match_trees(int ac, const char **av)
|
|
{
|
|
struct object_id hash1, hash2, shifted;
|
|
struct tree *one, *two;
|
|
|
|
setup_git_directory();
|
|
|
|
if (repo_get_oid(the_repository, av[1], &hash1))
|
|
die("cannot parse %s as an object name", av[1]);
|
|
if (repo_get_oid(the_repository, 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(the_repository, &one->object.oid, &two->object.oid, &shifted, -1);
|
|
printf("shifted: %s\n", oid_to_hex(&shifted));
|
|
|
|
return 0;
|
|
}
|