mirror of
https://github.com/git/git
synced 2024-08-27 03:29:21 +00:00
ccd12a3d6c
More header clean-up. * en/header-split-cache-h-part-2: (22 commits) reftable: ensure git-compat-util.h is the first (indirect) include diff.h: reduce unnecessary includes object-store.h: reduce unnecessary includes commit.h: reduce unnecessary includes fsmonitor: reduce includes of cache.h cache.h: remove unnecessary headers treewide: remove cache.h inclusion due to previous changes cache,tree: move basic name compare functions from read-cache to tree cache,tree: move cmp_cache_name_compare from tree.[ch] to read-cache.c hash-ll.h: split out of hash.h to remove dependency on repository.h tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h dir.h: move DTYPE defines from cache.h versioncmp.h: move declarations for versioncmp.c functions from cache.h ws.h: move declarations for ws.c functions from cache.h match-trees.h: move declarations for match-trees.c functions from cache.h pkt-line.h: move declarations for pkt-line.c functions from cache.h base85.h: move declarations for base85.c functions from cache.h copy.h: move declarations for copy.c functions from cache.h server-info.h: move declarations for server-info.c functions from cache.h packfile.h: move pack_window and pack_entry from cache.h ...
32 lines
807 B
C
32 lines
807 B
C
#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();
|
|
|
|
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;
|
|
}
|