mirror of
https://github.com/git/git.git
synced 2026-10-24 15:15:19 +02:00
Patrick Steinhardt
f9210dbc8a
Stop using `the_repository` in `setup_git_directory()` and instead accept the repository as a parameter. The injection of `the_repository` is thus bumped one level higher, where callers now pass it in explicitly. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
34 lines
900 B
C
34 lines
900 B
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
|
|
#include "test-tool.h"
|
|
#include "hex.h"
|
|
#include "match-trees.h"
|
|
#include "object-name.h"
|
|
#include "repository.h"
|
|
#include "setup.h"
|
|
#include "tree.h"
|
|
|
|
int cmd__match_trees(int ac UNUSED, const char **av)
|
|
{
|
|
struct object_id hash1, hash2, shifted;
|
|
struct tree *one, *two;
|
|
|
|
setup_git_directory(the_repository);
|
|
|
|
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 = repo_parse_tree_indirect(the_repository, &hash1);
|
|
if (!one)
|
|
die("not a tree-ish %s", av[1]);
|
|
two = repo_parse_tree_indirect(the_repository, &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;
|
|
}
|