[libgit2.git] / tests-clar / merge / trees / treediff.c

#include "clar_libgit2.h"
#include "git2/tree.h"
#include "merge.h"
#include "../merge_helpers.h"
#include "diff.h"
#include "hashsig.h"

static git_repository *repo;

#define TEST_REPO_PATH "merge-resolve"

#define TREE_OID_ANCESTOR		"0d52e3a556e189ba0948ae56780918011c1b167d"
#define TREE_OID_MASTER			"1f81433e3161efbf250576c58fede7f6b836f3d3"
#define TREE_OID_BRANCH			"eea9286df54245fea72c5b557291470eb825f38f"

#define TREE_OID_DF_ANCESTOR	"b8a3a806d3950e8c0a03a34f234a92eff0e2c68d"
#define TREE_OID_DF_SIDE1		"ee1d6f164893c1866a323f072eeed36b855656be"
#define TREE_OID_DF_SIDE2		"6178885b38fe96e825ac0f492c0a941f288b37f6"

void test_merge_trees_treediff__initialize(void)
{
	repo = cl_git_sandbox_init(TEST_REPO_PATH);
}

void test_merge_trees_treediff__cleanup(void)
{
	cl_git_sandbox_cleanup();
}

struct treediff_cb_data {
    struct merge_index_conflict_data *conflict_data;
    size_t conflict_data_len;

    size_t idx;
};

static void test_find_differences(
    const char *ancestor_oidstr,
    const char *ours_oidstr,
    const char *theirs_oidstr,
    struct merge_index_conflict_data *treediff_conflict_data,
    size_t treediff_conflict_data_len)
{
    git_merge_diff_list *merge_diff_list = git_merge_diff_list__alloc(repo);
    git_oid ancestor_oid, ours_oid, theirs_oid;
    git_tree *ancestor_tree, *ours_tree, *theirs_tree;
    struct treediff_cb_data treediff_cb_data = {0};

    cl_git_pass(git_oid_fromstr(&ancestor_oid, ancestor_oidstr));
    cl_git_pass(git_oid_fromstr(&ours_oid, ours_oidstr));
    cl_git_pass(git_oid_fromstr(&theirs_oid, theirs_oidstr));
    
    cl_git_pass(git_tree_lookup(&ancestor_tree, repo, &ancestor_oid));
    cl_git_pass(git_tree_lookup(&ours_tree, repo, &ours_oid));
    cl_git_pass(git_tree_lookup(&theirs_tree, repo, &theirs_oid));
    
	cl_git_pass(git_merge_diff_list__find_differences(merge_diff_list, ancestor_tree, ours_tree, theirs_tree));

	/*
	dump_merge_index(merge_index);
	 */
	
    cl_assert(treediff_conflict_data_len == merge_diff_list->conflicts.length);
    
    treediff_cb_data.conflict_data = treediff_conflict_data;
	treediff_cb_data.conflict_data_len = treediff_conflict_data_len;

	cl_assert(merge_test_merge_conflicts(&merge_diff_list->conflicts, treediff_conflict_data, treediff_conflict_data_len));

    git_tree_free(ancestor_tree);
    git_tree_free(ours_tree);
    git_tree_free(theirs_tree);
    
	git_merge_diff_list__free(merge_diff_list);
}

void test_merge_trees_treediff__simple(void)
{
    struct merge_index_conflict_data treediff_conflict_data[] = {
		{
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			{ 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt", GIT_DELTA_ADDED },
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			GIT_MERGE_DIFF_NONE
		},

        {
			{ 0100644, "6212c31dab5e482247d7977e4f0dd3601decf13b", 0, "automergeable.txt", GIT_DELTA_UNMODIFIED },
			{ 0100644, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", 0, "automergeable.txt", GIT_DELTA_MODIFIED },
			{ 0100644, "058541fc37114bfc1dddf6bd6bffc7fae5c2e6fe", 0, "automergeable.txt", GIT_DELTA_MODIFIED },
			GIT_MERGE_DIFF_BOTH_MODIFIED
		},
		
		{
			{ 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-branch.txt", GIT_DELTA_UNMODIFIED },
			{ 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-branch.txt", GIT_DELTA_UNMODIFIED },
			{ 0100644, "4eb04c9e79e88f6640d01ff5b25ca2a60764f216", 0, "changed-in-branch.txt", GIT_DELTA_MODIFIED },
			GIT_MERGE_DIFF_NONE
		},
		
		{
			{ 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-master.txt", GIT_DELTA_UNMODIFIED },
			{ 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0, "changed-in-master.txt", GIT_DELTA_MODIFIED },
			{ 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-master.txt", GIT_DELTA_UNMODIFIED },
			GIT_MERGE_DIFF_NONE
        },
		
		{
			{ 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 0, "conflicting.txt", GIT_DELTA_UNMODIFIED },
			{ 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 0, "conflicting.txt", GIT_DELTA_MODIFIED },
			{ 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 0, "conflicting.txt", GIT_DELTA_MODIFIED },
			GIT_MERGE_DIFF_BOTH_MODIFIED
        },
		
		{
			{ 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "removed-in-branch.txt", GIT_DELTA_UNMODIFIED },
			{ 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "removed-in-branch.txt", GIT_DELTA_UNMODIFIED },
			{ 0, "", 0, "", GIT_DELTA_DELETED },
			GIT_MERGE_DIFF_NONE
        },
		
		{
			{ 0100644, "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5", 0, "removed-in-master.txt", GIT_DELTA_UNMODIFIED },
			{ 0, "", 0, "", GIT_DELTA_DELETED },
			{ 0100644, "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5", 0, "removed-in-master.txt", GIT_DELTA_UNMODIFIED },
			GIT_MERGE_DIFF_NONE
		},
    };
    
    test_find_differences(TREE_OID_ANCESTOR, TREE_OID_MASTER, TREE_OID_BRANCH, treediff_conflict_data, 7);
}

void test_merge_trees_treediff__df_conflicts(void)
{
    struct merge_index_conflict_data treediff_conflict_data[] = {
		{
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			{ 0100644, "49130a28ef567af9a6a6104c38773fedfa5f9742", 0, "dir-10", GIT_DELTA_ADDED },
			{ 0100644, "6c06dcd163587c2cc18be44857e0b71116382aeb", 0, "dir-10", GIT_DELTA_ADDED },
			GIT_MERGE_DIFF_BOTH_ADDED,
		},

		{
			{ 0100644, "242591eb280ee9eeb2ce63524b9a8b9bc4cb515d", 0, "dir-10/file.txt", GIT_DELTA_UNMODIFIED },
			{ 0, "", 0, "", GIT_DELTA_DELETED },
			{ 0, "", 0, "", GIT_DELTA_DELETED },
			GIT_MERGE_DIFF_BOTH_DELETED,
		},
		
		{
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			{ 0100644, "43aafd43bea779ec74317dc361f45ae3f532a505", 0, "dir-6", GIT_DELTA_ADDED },
			GIT_MERGE_DIFF_NONE,
		},

		{
			{ 0100644, "cf8c5cc8a85a1ff5a4ba51e0bc7cf5665669924d", 0, "dir-6/file.txt", GIT_DELTA_UNMODIFIED },
			{ 0100644, "cf8c5cc8a85a1ff5a4ba51e0bc7cf5665669924d", 0, "dir-6/file.txt", GIT_DELTA_UNMODIFIED },
			{ 0, "", 0, "", GIT_DELTA_DELETED },
			GIT_MERGE_DIFF_NONE,
		},
		
		{
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			{ 0100644, "a031a28ae70e33a641ce4b8a8f6317f1ab79dee4", 0, "dir-7", GIT_DELTA_ADDED },
			GIT_MERGE_DIFF_DIRECTORY_FILE,
		},

		{
			{ 0100644, "5012fd565b1393bdfda1805d4ec38ce6619e1fd1", 0, "dir-7/file.txt", GIT_DELTA_UNMODIFIED },
			{ 0100644, "a5563304ddf6caba25cb50323a2ea6f7dbfcadca", 0, "dir-7/file.txt", GIT_DELTA_MODIFIED },
			{ 0, "", 0, "", GIT_DELTA_DELETED },
			GIT_MERGE_DIFF_DF_CHILD,
		},
		
		{
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			{ 0100644, "e9ad6ec3e38364a3d07feda7c4197d4d845c53b5", 0, "dir-8", GIT_DELTA_ADDED },
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			GIT_MERGE_DIFF_NONE,
		},

		{
			{ 0100644, "f20c9063fa0bda9a397c96947a7b687305c49753", 0, "dir-8/file.txt", GIT_DELTA_UNMODIFIED },
			{ 0, "", 0, "", GIT_DELTA_DELETED },
			{ 0100644, "f20c9063fa0bda9a397c96947a7b687305c49753", 0, "dir-8/file.txt", GIT_DELTA_UNMODIFIED },
			GIT_MERGE_DIFF_NONE,
		},
		
		{
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			{ 0100644, "3ef4d30382ca33fdeba9fda895a99e0891ba37aa", 0, "dir-9", GIT_DELTA_ADDED },
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			GIT_MERGE_DIFF_DIRECTORY_FILE,
		},

		{
			{ 0100644, "fc4c636d6515e9e261f9260dbcf3cc6eca97ea08", 0, "dir-9/file.txt", GIT_DELTA_UNMODIFIED },
			{ 0, "", 0, "", GIT_DELTA_DELETED },
			{ 0100644, "76ab0e2868197ec158ddd6c78d8a0d2fd73d38f9", 0, "dir-9/file.txt", GIT_DELTA_MODIFIED },
			GIT_MERGE_DIFF_DF_CHILD,
		},

		{
			{ 0100644, "1e4ff029aee68d0d69ef9eb6efa6cbf1ec732f99", 0, "file-1",  GIT_DELTA_UNMODIFIED },
			{ 0100644, "1e4ff029aee68d0d69ef9eb6efa6cbf1ec732f99", 0, "file-1",  GIT_DELTA_UNMODIFIED },
			{ 0, "", 0, "", GIT_DELTA_DELETED },
			GIT_MERGE_DIFF_NONE,
		},

		{
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			{ 0100644, "5c2411f8075f48a6b2fdb85ebc0d371747c4df15", 0, "file-1/new", GIT_DELTA_ADDED },
			GIT_MERGE_DIFF_NONE,
		},

		{
			{ 0100644, "a39a620dae5bc8b4e771cd4d251b7d080401a21e", 0, "file-2", GIT_DELTA_UNMODIFIED },
			{ 0100644, "d963979c237d08b6ba39062ee7bf64c7d34a27f8", 0, "file-2", GIT_DELTA_MODIFIED },
			{ 0, "", 0, "", GIT_DELTA_DELETED },
			GIT_MERGE_DIFF_DIRECTORY_FILE,
		},
		
		{
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			{ 0100644, "5c341ead2ba6f2af98ce5ec3fe84f6b6d2899c0d", 0, "file-2/new", GIT_DELTA_ADDED },
			GIT_MERGE_DIFF_DF_CHILD,
		},

		{
			{ 0100644, "032ebc5ab85d9553bb187d3cd40875ff23a63ed0", 0, "file-3", GIT_DELTA_UNMODIFIED },
			{ 0, "", 0, "", GIT_DELTA_DELETED },
			{ 0100644, "032ebc5ab85d9553bb187d3cd40875ff23a63ed0", 0, "file-3", GIT_DELTA_UNMODIFIED },
			GIT_MERGE_DIFF_NONE,
		},

		{
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			{ 0100644, "9efe7723802d4305142eee177e018fee1572c4f4", 0, "file-3/new", GIT_DELTA_ADDED },
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			GIT_MERGE_DIFF_NONE,
		},

		{
			{ 0100644, "bacac9b3493509aa15e1730e1545fc0919d1dae0", 0, "file-4", GIT_DELTA_UNMODIFIED },
			{ 0, "", 0, "", GIT_DELTA_DELETED },
			{ 0100644, "7663fce0130db092936b137cabd693ec234eb060", 0, "file-4", GIT_DELTA_MODIFIED },
			GIT_MERGE_DIFF_DIRECTORY_FILE,
		},

		{
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			{ 0100644, "e49f917b448d1340b31d76e54ba388268fd4c922", 0, "file-4/new", GIT_DELTA_ADDED },
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			GIT_MERGE_DIFF_DF_CHILD,
		},

		{
			{ 0100644, "ac4045f965119e6998f4340ed0f411decfb3ec05", 0, "file-5", GIT_DELTA_UNMODIFIED },
			{ 0, "", 0, "", GIT_DELTA_DELETED },
			{ 0, "", 0, "", GIT_DELTA_DELETED },
			GIT_MERGE_DIFF_BOTH_DELETED,
		},
		
		{
			{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
			{ 0100644, "cab2cf23998b40f1af2d9d9a756dc9e285a8df4b", 0, "file-5/new", GIT_DELTA_ADDED },
			{ 0100644, "f5504f36e6f4eb797a56fc5bac6c6c7f32969bf2", 0, "file-5/new", GIT_DELTA_ADDED },
			GIT_MERGE_DIFF_BOTH_ADDED,
		},
	};
	
	test_find_differences(TREE_OID_DF_ANCESTOR, TREE_OID_DF_SIDE1, TREE_OID_DF_SIDE2, treediff_conflict_data, 20);
}
Commit	Line	Data
bec65a5e ET	1	#include "clar_libgit2.h"
	2	#include "git2/tree.h"
	3	#include "merge.h"
	4	#include "../merge_helpers.h"
	5	#include "diff.h"
	6	#include "hashsig.h"
	7
	8	static git_repository *repo;
	9
	10	#define TEST_REPO_PATH "merge-resolve"
	11
	12	#define TREE_OID_ANCESTOR "0d52e3a556e189ba0948ae56780918011c1b167d"
	13	#define TREE_OID_MASTER "1f81433e3161efbf250576c58fede7f6b836f3d3"
	14	#define TREE_OID_BRANCH "eea9286df54245fea72c5b557291470eb825f38f"
	15
	16	#define TREE_OID_DF_ANCESTOR "b8a3a806d3950e8c0a03a34f234a92eff0e2c68d"
	17	#define TREE_OID_DF_SIDE1 "ee1d6f164893c1866a323f072eeed36b855656be"
	18	#define TREE_OID_DF_SIDE2 "6178885b38fe96e825ac0f492c0a941f288b37f6"
	19
	20	void test_merge_trees_treediff__initialize(void)
	21	{
	22	repo = cl_git_sandbox_init(TEST_REPO_PATH);
	23	}
	24
	25	void test_merge_trees_treediff__cleanup(void)
	26	{
	27	cl_git_sandbox_cleanup();
	28	}
	29
	30	struct treediff_cb_data {
	31	struct merge_index_conflict_data *conflict_data;
	32	size_t conflict_data_len;
	33
	34	size_t idx;
	35	};
	36
	37	static void test_find_differences(
	38	const char *ancestor_oidstr,
	39	const char *ours_oidstr,
	40	const char *theirs_oidstr,
	41	struct merge_index_conflict_data *treediff_conflict_data,
	42	size_t treediff_conflict_data_len)
	43	{
	44	git_merge_diff_list *merge_diff_list = git_merge_diff_list__alloc(repo);
	45	git_oid ancestor_oid, ours_oid, theirs_oid;
	46	git_tree ancestor_tree, ours_tree, *theirs_tree;
	47	struct treediff_cb_data treediff_cb_data = {0};
	48
	49	cl_git_pass(git_oid_fromstr(&ancestor_oid, ancestor_oidstr));
	50	cl_git_pass(git_oid_fromstr(&ours_oid, ours_oidstr));
	51	cl_git_pass(git_oid_fromstr(&theirs_oid, theirs_oidstr));
	52
	53	cl_git_pass(git_tree_lookup(&ancestor_tree, repo, &ancestor_oid));
	54	cl_git_pass(git_tree_lookup(&ours_tree, repo, &ours_oid));
	55	cl_git_pass(git_tree_lookup(&theirs_tree, repo, &theirs_oid));
	56
	57	cl_git_pass(git_merge_diff_list__find_differences(merge_diff_list, ancestor_tree, ours_tree, theirs_tree));
	58
	59	/*
	60	dump_merge_index(merge_index);
	61	*/
	62
	63	cl_assert(treediff_conflict_data_len == merge_diff_list->conflicts.length);
	64
65	treediff_cb_data.conflict_data = treediff_conflict_data;
66	treediff_cb_data.conflict_data_len = treediff_conflict_data_len;
67
68	cl_assert(merge_test_merge_conflicts(&merge_diff_list->conflicts, treediff_conflict_data, treediff_conflict_data_len));
69
70	git_tree_free(ancestor_tree);
71	git_tree_free(ours_tree);
72	git_tree_free(theirs_tree);
73
74	git_merge_diff_list__free(merge_diff_list);
75	}
76
77	void test_merge_trees_treediff__simple(void)
78	{
79	struct merge_index_conflict_data treediff_conflict_data[] = {
80	{
81	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
82	{ 0100644, "233c0919c998ed110a4b6ff36f353aec8b713487", 0, "added-in-master.txt", GIT_DELTA_ADDED },
83	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
84	GIT_MERGE_DIFF_NONE
85	},
86
87	{
88	{ 0100644, "6212c31dab5e482247d7977e4f0dd3601decf13b", 0, "automergeable.txt", GIT_DELTA_UNMODIFIED },
89	{ 0100644, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf", 0, "automergeable.txt", GIT_DELTA_MODIFIED },
90	{ 0100644, "058541fc37114bfc1dddf6bd6bffc7fae5c2e6fe", 0, "automergeable.txt", GIT_DELTA_MODIFIED },
91	GIT_MERGE_DIFF_BOTH_MODIFIED
92	},
93
94	{
95	{ 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-branch.txt", GIT_DELTA_UNMODIFIED },
96	{ 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-branch.txt", GIT_DELTA_UNMODIFIED },
97	{ 0100644, "4eb04c9e79e88f6640d01ff5b25ca2a60764f216", 0, "changed-in-branch.txt", GIT_DELTA_MODIFIED },
98	GIT_MERGE_DIFF_NONE
99	},
100
101	{
102	{ 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-master.txt", GIT_DELTA_UNMODIFIED },
103	{ 0100644, "11deab00b2d3a6f5a3073988ac050c2d7b6655e2", 0, "changed-in-master.txt", GIT_DELTA_MODIFIED },
104	{ 0100644, "ab6c44a2e84492ad4b41bb6bac87353e9d02ac8b", 0, "changed-in-master.txt", GIT_DELTA_UNMODIFIED },
105	GIT_MERGE_DIFF_NONE
106	},
107
108	{
109	{ 0100644, "d427e0b2e138501a3d15cc376077a3631e15bd46", 0, "conflicting.txt", GIT_DELTA_UNMODIFIED },
110	{ 0100644, "4e886e602529caa9ab11d71f86634bd1b6e0de10", 0, "conflicting.txt", GIT_DELTA_MODIFIED },
111	{ 0100644, "2bd0a343aeef7a2cf0d158478966a6e587ff3863", 0, "conflicting.txt", GIT_DELTA_MODIFIED },
112	GIT_MERGE_DIFF_BOTH_MODIFIED
113	},
114
115	{
116	{ 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "removed-in-branch.txt", GIT_DELTA_UNMODIFIED },
117	{ 0100644, "dfe3f22baa1f6fce5447901c3086bae368de6bdd", 0, "removed-in-branch.txt", GIT_DELTA_UNMODIFIED },
118	{ 0, "", 0, "", GIT_DELTA_DELETED },
119	GIT_MERGE_DIFF_NONE
120	},
121
122	{
123	{ 0100644, "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5", 0, "removed-in-master.txt", GIT_DELTA_UNMODIFIED },
124	{ 0, "", 0, "", GIT_DELTA_DELETED },
125	{ 0100644, "5c3b68a71fc4fa5d362fd3875e53137c6a5ab7a5", 0, "removed-in-master.txt", GIT_DELTA_UNMODIFIED },
126	GIT_MERGE_DIFF_NONE
127	},
128	};
129
130	test_find_differences(TREE_OID_ANCESTOR, TREE_OID_MASTER, TREE_OID_BRANCH, treediff_conflict_data, 7);
131	}
132
133	void test_merge_trees_treediff__df_conflicts(void)
134	{
135	struct merge_index_conflict_data treediff_conflict_data[] = {
136	{
137	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
138	{ 0100644, "49130a28ef567af9a6a6104c38773fedfa5f9742", 0, "dir-10", GIT_DELTA_ADDED },
139	{ 0100644, "6c06dcd163587c2cc18be44857e0b71116382aeb", 0, "dir-10", GIT_DELTA_ADDED },
140	GIT_MERGE_DIFF_BOTH_ADDED,
141	},
142
143	{
144	{ 0100644, "242591eb280ee9eeb2ce63524b9a8b9bc4cb515d", 0, "dir-10/file.txt", GIT_DELTA_UNMODIFIED },
145	{ 0, "", 0, "", GIT_DELTA_DELETED },
146	{ 0, "", 0, "", GIT_DELTA_DELETED },
147	GIT_MERGE_DIFF_BOTH_DELETED,
148	},
149
150	{
151	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
152	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
153	{ 0100644, "43aafd43bea779ec74317dc361f45ae3f532a505", 0, "dir-6", GIT_DELTA_ADDED },
154	GIT_MERGE_DIFF_NONE,
155	},
156
157	{
158	{ 0100644, "cf8c5cc8a85a1ff5a4ba51e0bc7cf5665669924d", 0, "dir-6/file.txt", GIT_DELTA_UNMODIFIED },
159	{ 0100644, "cf8c5cc8a85a1ff5a4ba51e0bc7cf5665669924d", 0, "dir-6/file.txt", GIT_DELTA_UNMODIFIED },
160	{ 0, "", 0, "", GIT_DELTA_DELETED },
161	GIT_MERGE_DIFF_NONE,
162	},
163
164	{
165	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
166	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
167	{ 0100644, "a031a28ae70e33a641ce4b8a8f6317f1ab79dee4", 0, "dir-7", GIT_DELTA_ADDED },
168	GIT_MERGE_DIFF_DIRECTORY_FILE,
169	},
170
171	{
172	{ 0100644, "5012fd565b1393bdfda1805d4ec38ce6619e1fd1", 0, "dir-7/file.txt", GIT_DELTA_UNMODIFIED },
173	{ 0100644, "a5563304ddf6caba25cb50323a2ea6f7dbfcadca", 0, "dir-7/file.txt", GIT_DELTA_MODIFIED },
174	{ 0, "", 0, "", GIT_DELTA_DELETED },
175	GIT_MERGE_DIFF_DF_CHILD,
176	},
177
178	{
179	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
180	{ 0100644, "e9ad6ec3e38364a3d07feda7c4197d4d845c53b5", 0, "dir-8", GIT_DELTA_ADDED },
181	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
182	GIT_MERGE_DIFF_NONE,
183	},
184
185	{
186	{ 0100644, "f20c9063fa0bda9a397c96947a7b687305c49753", 0, "dir-8/file.txt", GIT_DELTA_UNMODIFIED },
187	{ 0, "", 0, "", GIT_DELTA_DELETED },
188	{ 0100644, "f20c9063fa0bda9a397c96947a7b687305c49753", 0, "dir-8/file.txt", GIT_DELTA_UNMODIFIED },
189	GIT_MERGE_DIFF_NONE,
190	},
191
192	{
193	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
194	{ 0100644, "3ef4d30382ca33fdeba9fda895a99e0891ba37aa", 0, "dir-9", GIT_DELTA_ADDED },
195	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
196	GIT_MERGE_DIFF_DIRECTORY_FILE,
197	},
198
199	{
200	{ 0100644, "fc4c636d6515e9e261f9260dbcf3cc6eca97ea08", 0, "dir-9/file.txt", GIT_DELTA_UNMODIFIED },
201	{ 0, "", 0, "", GIT_DELTA_DELETED },
202	{ 0100644, "76ab0e2868197ec158ddd6c78d8a0d2fd73d38f9", 0, "dir-9/file.txt", GIT_DELTA_MODIFIED },
203	GIT_MERGE_DIFF_DF_CHILD,
204	},
205
206	{
207	{ 0100644, "1e4ff029aee68d0d69ef9eb6efa6cbf1ec732f99", 0, "file-1", GIT_DELTA_UNMODIFIED },
208	{ 0100644, "1e4ff029aee68d0d69ef9eb6efa6cbf1ec732f99", 0, "file-1", GIT_DELTA_UNMODIFIED },
209	{ 0, "", 0, "", GIT_DELTA_DELETED },
210	GIT_MERGE_DIFF_NONE,
211	},
212
213	{
214	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
215	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
216	{ 0100644, "5c2411f8075f48a6b2fdb85ebc0d371747c4df15", 0, "file-1/new", GIT_DELTA_ADDED },
217	GIT_MERGE_DIFF_NONE,
218	},
219
220	{
221	{ 0100644, "a39a620dae5bc8b4e771cd4d251b7d080401a21e", 0, "file-2", GIT_DELTA_UNMODIFIED },
222	{ 0100644, "d963979c237d08b6ba39062ee7bf64c7d34a27f8", 0, "file-2", GIT_DELTA_MODIFIED },
223	{ 0, "", 0, "", GIT_DELTA_DELETED },
224	GIT_MERGE_DIFF_DIRECTORY_FILE,
225	},
226
227	{
228	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
229	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
230	{ 0100644, "5c341ead2ba6f2af98ce5ec3fe84f6b6d2899c0d", 0, "file-2/new", GIT_DELTA_ADDED },
231	GIT_MERGE_DIFF_DF_CHILD,
232	},
233
234	{
235	{ 0100644, "032ebc5ab85d9553bb187d3cd40875ff23a63ed0", 0, "file-3", GIT_DELTA_UNMODIFIED },
236	{ 0, "", 0, "", GIT_DELTA_DELETED },
237	{ 0100644, "032ebc5ab85d9553bb187d3cd40875ff23a63ed0", 0, "file-3", GIT_DELTA_UNMODIFIED },
238	GIT_MERGE_DIFF_NONE,
239	},
240
241	{
242	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
243	{ 0100644, "9efe7723802d4305142eee177e018fee1572c4f4", 0, "file-3/new", GIT_DELTA_ADDED },
244	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
245	GIT_MERGE_DIFF_NONE,
246	},
247
248	{
249	{ 0100644, "bacac9b3493509aa15e1730e1545fc0919d1dae0", 0, "file-4", GIT_DELTA_UNMODIFIED },
250	{ 0, "", 0, "", GIT_DELTA_DELETED },
251	{ 0100644, "7663fce0130db092936b137cabd693ec234eb060", 0, "file-4", GIT_DELTA_MODIFIED },
252	GIT_MERGE_DIFF_DIRECTORY_FILE,
253	},
254
255	{
256	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
257	{ 0100644, "e49f917b448d1340b31d76e54ba388268fd4c922", 0, "file-4/new", GIT_DELTA_ADDED },
258	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
259	GIT_MERGE_DIFF_DF_CHILD,
260	},
261
262	{
263	{ 0100644, "ac4045f965119e6998f4340ed0f411decfb3ec05", 0, "file-5", GIT_DELTA_UNMODIFIED },
264	{ 0, "", 0, "", GIT_DELTA_DELETED },
265	{ 0, "", 0, "", GIT_DELTA_DELETED },
266	GIT_MERGE_DIFF_BOTH_DELETED,
267	},
268
269	{
270	{ 0, "", 0, "", GIT_DELTA_UNMODIFIED },
271	{ 0100644, "cab2cf23998b40f1af2d9d9a756dc9e285a8df4b", 0, "file-5/new", GIT_DELTA_ADDED },
272	{ 0100644, "f5504f36e6f4eb797a56fc5bac6c6c7f32969bf2", 0, "file-5/new", GIT_DELTA_ADDED },
273	GIT_MERGE_DIFF_BOTH_ADDED,
274	},
275	};
276
277	test_find_differences(TREE_OID_DF_ANCESTOR, TREE_OID_DF_SIDE1, TREE_OID_DF_SIDE2, treediff_conflict_data, 20);
278	}
279