[thirdparty/git.git] / tree-diff.c

/*
 * Helper functions for tree diff generation
 */
#include "cache.h"
#include "diff.h"
#include "diffcore.h"
#include "tree.h"

static void show_path(struct strbuf *base, struct diff_options *opt,
		      struct tree_desc *t1, struct tree_desc *t2);

static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2,
			      struct strbuf *base, struct diff_options *opt)
{
	unsigned mode1, mode2;
	const char *path1, *path2;
	const unsigned char *sha1, *sha2;
	int cmp, pathlen1, pathlen2;

	sha1 = tree_entry_extract(t1, &path1, &mode1);
	sha2 = tree_entry_extract(t2, &path2, &mode2);

	pathlen1 = tree_entry_len(&t1->entry);
	pathlen2 = tree_entry_len(&t2->entry);

	/*
	 * NOTE files and directories *always* compare differently,
	 * even when having the same name.
	 */
	cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2);
	if (cmp < 0) {
		show_path(base, opt, t1, /*t2=*/NULL);
		return -1;
	}
	if (cmp > 0) {
		show_path(base, opt, /*t1=*/NULL, t2);
		return 1;
	}
	if (!DIFF_OPT_TST(opt, FIND_COPIES_HARDER) && !hashcmp(sha1, sha2) && mode1 == mode2)
		return 0;

	show_path(base, opt, t1, t2);
	return 0;
}


/* convert path, t1/t2 -> opt->diff_*() callbacks */
static void emit_diff(struct diff_options *opt, struct strbuf *path,
		      struct tree_desc *t1, struct tree_desc *t2)
{
	unsigned int mode1 = t1 ? t1->entry.mode : 0;
	unsigned int mode2 = t2 ? t2->entry.mode : 0;

	if (mode1 && mode2) {
		opt->change(opt, mode1, mode2, t1->entry.sha1, t2->entry.sha1,
			1, 1, path->buf, 0, 0);
	}
	else {
		const unsigned char *sha1;
		unsigned int mode;
		int addremove;

		if (mode2) {
			addremove = '+';
			sha1 = t2->entry.sha1;
			mode = mode2;
		} else {
			addremove = '-';
			sha1 = t1->entry.sha1;
			mode = mode1;
		}

		opt->add_remove(opt, addremove, mode, sha1, 1, path->buf, 0);
	}
}


/* new path should be added to diff
 *
 * 3 cases on how/when it should be called and behaves:
 *
 *	!t1,  t2	-> path added, parent lacks it
 *	 t1, !t2	-> path removed from parent
 *	 t1,  t2	-> path modified
 */
static void show_path(struct strbuf *base, struct diff_options *opt,
		      struct tree_desc *t1, struct tree_desc *t2)
{
	unsigned mode;
	const char *path;
	int pathlen;
	int old_baselen = base->len;
	int isdir, recurse = 0, emitthis = 1;

	/* at least something has to be valid */
	assert(t1 || t2);

	if (t2) {
		/* path present in resulting tree */
		tree_entry_extract(t2, &path, &mode);
		pathlen = tree_entry_len(&t2->entry);
		isdir = S_ISDIR(mode);
	} else {
		/*
		 * a path was removed - take path from parent. Also take
		 * mode from parent, to decide on recursion.
		 */
		tree_entry_extract(t1, &path, &mode);
		pathlen = tree_entry_len(&t1->entry);

		isdir = S_ISDIR(mode);
		mode = 0;
	}

	if (DIFF_OPT_TST(opt, RECURSIVE) && isdir) {
		recurse = 1;
		emitthis = DIFF_OPT_TST(opt, TREE_IN_RECURSIVE);
	}

	strbuf_add(base, path, pathlen);

	if (emitthis)
		emit_diff(opt, base, t1, t2);

	if (recurse) {
		strbuf_addch(base, '/');
		diff_tree_sha1(t1 ? t1->entry.sha1 : NULL,
			       t2 ? t2->entry.sha1 : NULL, base->buf, opt);
	}

	strbuf_setlen(base, old_baselen);
}

static void skip_uninteresting(struct tree_desc *t, struct strbuf *base,
			       struct diff_options *opt)
{
	enum interesting match;

	while (t->size) {
		match = tree_entry_interesting(&t->entry, base, 0, &opt->pathspec);
		if (match) {
			if (match == all_entries_not_interesting)
				t->size = 0;
			break;
		}
		update_tree_entry(t);
	}
}

int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
	      const char *base_str, struct diff_options *opt)
{
	struct strbuf base;
	int baselen = strlen(base_str);

	/* Enable recursion indefinitely */
	opt->pathspec.recursive = DIFF_OPT_TST(opt, RECURSIVE);

	strbuf_init(&base, PATH_MAX);
	strbuf_add(&base, base_str, baselen);

	for (;;) {
		if (diff_can_quit_early(opt))
			break;
		if (opt->pathspec.nr) {
			skip_uninteresting(t1, &base, opt);
			skip_uninteresting(t2, &base, opt);
		}
		if (!t1->size) {
			if (!t2->size)
				break;
			show_path(&base, opt, /*t1=*/NULL, t2);
			update_tree_entry(t2);
			continue;
		}
		if (!t2->size) {
			show_path(&base, opt, t1, /*t2=*/NULL);
			update_tree_entry(t1);
			continue;
		}

		cmp = compare_tree_entry(t1, t2, &base, opt);

		/* t1 = t2 */
		if (cmp == 0) {
			update_tree_entry(t1);
			update_tree_entry(t2);
		}

		/* t1 < t2 */
		else if (cmp < 0) {
			update_tree_entry(t1);
		}

		/* t1 > t2 */
		else {
			update_tree_entry(t2);
		}
	}

	strbuf_release(&base);
	return 0;
}

/*
 * Does it look like the resulting diff might be due to a rename?
 *  - single entry
 *  - not a valid previous file
 */
static inline int diff_might_be_rename(void)
{
	return diff_queued_diff.nr == 1 &&
		!DIFF_FILE_VALID(diff_queued_diff.queue[0]->one);
}

static void try_to_follow_renames(struct tree_desc *t1, struct tree_desc *t2, const char *base, struct diff_options *opt)
{
	struct diff_options diff_opts;
	struct diff_queue_struct *q = &diff_queued_diff;
	struct diff_filepair *choice;
	int i;

	/*
	 * follow-rename code is very specific, we need exactly one
	 * path. Magic that matches more than one path is not
	 * supported.
	 */
	GUARD_PATHSPEC(&opt->pathspec, PATHSPEC_FROMTOP | PATHSPEC_LITERAL);
#if 0
	/*
	 * We should reject wildcards as well. Unfortunately we
	 * haven't got a reliable way to detect that 'foo\*bar' in
	 * fact has no wildcards. nowildcard_len is merely a hint for
	 * optimization. Let it slip for now until wildmatch is taught
	 * about dry-run mode and returns wildcard info.
	 */
	if (opt->pathspec.has_wildcard)
		die("BUG:%s:%d: wildcards are not supported",
		    __FILE__, __LINE__);
#endif

	/* Remove the file creation entry from the diff queue, and remember it */
	choice = q->queue[0];
	q->nr = 0;

	diff_setup(&diff_opts);
	DIFF_OPT_SET(&diff_opts, RECURSIVE);
	DIFF_OPT_SET(&diff_opts, FIND_COPIES_HARDER);
	diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
	diff_opts.single_follow = opt->pathspec.items[0].match;
	diff_opts.break_opt = opt->break_opt;
	diff_opts.rename_score = opt->rename_score;
	diff_setup_done(&diff_opts);
	diff_tree(t1, t2, base, &diff_opts);
	diffcore_std(&diff_opts);
	free_pathspec(&diff_opts.pathspec);

	/* Go through the new set of filepairing, and see if we find a more interesting one */
	opt->found_follow = 0;
	for (i = 0; i < q->nr; i++) {
		struct diff_filepair *p = q->queue[i];

		/*
		 * Found a source? Not only do we use that for the new
		 * diff_queued_diff, we will also use that as the path in
		 * the future!
		 */
		if ((p->status == 'R' || p->status == 'C') &&
		    !strcmp(p->two->path, opt->pathspec.items[0].match)) {
			const char *path[2];

			/* Switch the file-pairs around */
			q->queue[i] = choice;
			choice = p;

			/* Update the path we use from now on.. */
			path[0] = p->one->path;
			path[1] = NULL;
			free_pathspec(&opt->pathspec);
			parse_pathspec(&opt->pathspec,
				       PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
				       PATHSPEC_LITERAL_PATH, "", path);

			/*
			 * The caller expects us to return a set of vanilla
			 * filepairs to let a later call to diffcore_std()
			 * it makes to sort the renames out (among other
			 * things), but we already have found renames
			 * ourselves; signal diffcore_std() not to muck with
			 * rename information.
			 */
			opt->found_follow = 1;
			break;
		}
	}

	/*
	 * Then, discard all the non-relevant file pairs...
	 */
	for (i = 0; i < q->nr; i++) {
		struct diff_filepair *p = q->queue[i];
		diff_free_filepair(p);
	}

	/*
	 * .. and re-instate the one we want (which might be either the
	 * original one, or the rename/copy we found)
	 */
	q->queue[0] = choice;
	q->nr = 1;
}

int diff_tree_sha1(const unsigned char *old, const unsigned char *new, const char *base, struct diff_options *opt)
{
	void *tree1, *tree2;
	struct tree_desc t1, t2;
	unsigned long size1, size2;
	int retval;

	tree1 = fill_tree_descriptor(&t1, old);
	tree2 = fill_tree_descriptor(&t2, new);
	size1 = t1.size;
	size2 = t2.size;
	retval = diff_tree(&t1, &t2, base, opt);
	if (!*base && DIFF_OPT_TST(opt, FOLLOW_RENAMES) && diff_might_be_rename()) {
		init_tree_desc(&t1, tree1, size1);
		init_tree_desc(&t2, tree2, size2);
		try_to_follow_renames(&t1, &t2, base, opt);
	}
	free(tree1);
	free(tree2);
	return retval;
}

int diff_root_tree_sha1(const unsigned char *new, const char *base, struct diff_options *opt)
{
	return diff_tree_sha1(NULL, new, base, opt);
}
Commit	Line	Data
ac1b3d12 LT	1	/*
	2	* Helper functions for tree diff generation
	3	*/
	4	#include "cache.h"
	5	#include "diff.h"
750f7b66	6	#include "diffcore.h"
8e440259	7	#include "tree.h"
ac1b3d12	8
d00e980c KS	9	static void show_path(struct strbuf base, struct diff_options opt,
d00e980c KS	10	struct tree_desc t1, struct tree_desc t2);
ac1b3d12	11
48932677 NTND	12	static int compare_tree_entry(struct tree_desc t1, struct tree_desc t2,
48932677 NTND	13	struct strbuf base, struct diff_options opt)
ac1b3d12 LT	14	{
	15	unsigned mode1, mode2;
	16	const char path1, path2;
	17	const unsigned char sha1, sha2;
	18	int cmp, pathlen1, pathlen2;
	19
50f9a858 LT	20	sha1 = tree_entry_extract(t1, &path1, &mode1);
50f9a858 LT	21	sha2 = tree_entry_extract(t2, &path2, &mode2);
ac1b3d12	22
0de16337 NTND	23	pathlen1 = tree_entry_len(&t1->entry);
0de16337 NTND	24	pathlen2 = tree_entry_len(&t2->entry);
e197c2b6 KS	25
	26	/*
	27	* NOTE files and directories always compare differently,
	28	* even when having the same name.
	29	*/
ac1b3d12 LT	30	cmp = base_name_compare(path1, pathlen1, mode1, path2, pathlen2, mode2);
ac1b3d12 LT	31	if (cmp < 0) {
d00e980c	32	show_path(base, opt, t1, /t2=/NULL);
ac1b3d12 LT	33	return -1;
	34	}
	35	if (cmp > 0) {
d00e980c	36	show_path(base, opt, /t1=/NULL, t2);
ac1b3d12 LT	37	return 1;
ac1b3d12 LT	38	}
8f67f8ae	39	if (!DIFF_OPT_TST(opt, FIND_COPIES_HARDER) && !hashcmp(sha1, sha2) && mode1 == mode2)
ac1b3d12 LT	40	return 0;
ac1b3d12 LT	41
d00e980c KS	42	show_path(base, opt, t1, t2);
	43	return 0;
	44	}
	45
	46
	47	/* convert path, t1/t2 -> opt->diff_() callbacks /
	48	static void emit_diff(struct diff_options opt, struct strbuf path,
	49	struct tree_desc t1, struct tree_desc t2)
	50	{
	51	unsigned int mode1 = t1 ? t1->entry.mode : 0;
	52	unsigned int mode2 = t2 ? t2->entry.mode : 0;
	53
	54	if (mode1 && mode2) {
	55	opt->change(opt, mode1, mode2, t1->entry.sha1, t2->entry.sha1,
	56	1, 1, path->buf, 0, 0);
	57	}
	58	else {
	59	const unsigned char *sha1;
	60	unsigned int mode;
	61	int addremove;
	62
	63	if (mode2) {
	64	addremove = '+';
	65	sha1 = t2->entry.sha1;
	66	mode = mode2;
	67	} else {
	68	addremove = '-';
	69	sha1 = t1->entry.sha1;
	70	mode = mode1;
fd55a19e	71	}
d00e980c KS	72
d00e980c KS	73	opt->add_remove(opt, addremove, mode, sha1, 1, path->buf, 0);
ac1b3d12	74	}
ac1b3d12 LT	75	}
ac1b3d12 LT	76
d00e980c KS	77
	78	/* new path should be added to diff
	79	*
	80	* 3 cases on how/when it should be called and behaves:
	81	*
	82	* !t1, t2 -> path added, parent lacks it
	83	* t1, !t2 -> path removed from parent
	84	* t1, t2 -> path modified
	85	*/
	86	static void show_path(struct strbuf base, struct diff_options opt,
	87	struct tree_desc t1, struct tree_desc t2)
ac1b3d12 LT	88	{
	89	unsigned mode;
	90	const char *path;
d00e980c	91	int pathlen;
48932677	92	int old_baselen = base->len;
d00e980c KS	93	int isdir, recurse = 0, emitthis = 1;
	94
	95	/* at least something has to be valid */
	96	assert(t1 \|\| t2);
	97
	98	if (t2) {
	99	/* path present in resulting tree */
	100	tree_entry_extract(t2, &path, &mode);
	101	pathlen = tree_entry_len(&t2->entry);
	102	isdir = S_ISDIR(mode);
	103	} else {
	104	/*
	105	* a path was removed - take path from parent. Also take
	106	* mode from parent, to decide on recursion.
	107	*/
	108	tree_entry_extract(t1, &path, &mode);
	109	pathlen = tree_entry_len(&t1->entry);
	110
	111	isdir = S_ISDIR(mode);
	112	mode = 0;
	113	}
	114
	115	if (DIFF_OPT_TST(opt, RECURSIVE) && isdir) {
	116	recurse = 1;
	117	emitthis = DIFF_OPT_TST(opt, TREE_IN_RECURSIVE);
	118	}
ac1b3d12	119
48932677	120	strbuf_add(base, path, pathlen);
df533f34	121
d00e980c KS	122	if (emitthis)
	123	emit_diff(opt, base, t1, t2);
	124
	125	if (recurse) {
48932677	126	strbuf_addch(base, '/');
d00e980c KS	127	diff_tree_sha1(t1 ? t1->entry.sha1 : NULL,
	128	t2 ? t2->entry.sha1 : NULL, base->buf, opt);
	129	}
48932677 NTND	130
48932677 NTND	131	strbuf_setlen(base, old_baselen);
ac1b3d12 LT	132	}
ac1b3d12 LT	133
48932677	134	static void skip_uninteresting(struct tree_desc t, struct strbuf base,
e9066121	135	struct diff_options *opt)
5d865017	136	{
e9066121 KS	137	enum interesting match;
e9066121 KS	138
5d865017	139	while (t->size) {
e9066121 KS	140	match = tree_entry_interesting(&t->entry, base, 0, &opt->pathspec);
	141	if (match) {
	142	if (match == all_entries_not_interesting)
97d0b74a NTND	143	t->size = 0;
97d0b74a NTND	144	break;
5d865017	145	}
97d0b74a	146	update_tree_entry(t);
5d865017 LT	147	}
	148	}
	149
48932677 NTND	150	int diff_tree(struct tree_desc t1, struct tree_desc t2,
48932677 NTND	151	const char base_str, struct diff_options opt)
ac1b3d12	152	{
48932677 NTND	153	struct strbuf base;
48932677 NTND	154	int baselen = strlen(base_str);
304de2d2	155
bc96cc87 NTND	156	/* Enable recursion indefinitely */
bc96cc87 NTND	157	opt->pathspec.recursive = DIFF_OPT_TST(opt, RECURSIVE);
bc96cc87	158
48932677 NTND	159	strbuf_init(&base, PATH_MAX);
	160	strbuf_add(&base, base_str, baselen);
	161
5d865017	162	for (;;) {
28b9264d	163	if (diff_can_quit_early(opt))
822cac01	164	break;
66f13625	165	if (opt->pathspec.nr) {
e9066121 KS	166	skip_uninteresting(t1, &base, opt);
e9066121 KS	167	skip_uninteresting(t2, &base, opt);
ac1b3d12 LT	168	}
ac1b3d12 LT	169	if (!t1->size) {
5d865017 LT	170	if (!t2->size)
5d865017 LT	171	break;
d00e980c	172	show_path(&base, opt, /t1=/NULL, t2);
ac1b3d12 LT	173	update_tree_entry(t2);
	174	continue;
	175	}
	176	if (!t2->size) {
d00e980c	177	show_path(&base, opt, t1, /t2=/NULL);
ac1b3d12 LT	178	update_tree_entry(t1);
	179	continue;
	180	}
5dfb2bbd KS	181
	182	cmp = compare_tree_entry(t1, t2, &base, opt);
	183
	184	/* t1 = t2 */
	185	if (cmp == 0) {
ac1b3d12	186	update_tree_entry(t1);
5dfb2bbd KS	187	update_tree_entry(t2);
	188	}
	189
	190	/* t1 < t2 */
	191	else if (cmp < 0) {
ac1b3d12	192	update_tree_entry(t1);
5dfb2bbd KS	193	}
	194
	195	/* t1 > t2 */
	196	else {
ac1b3d12	197	update_tree_entry(t2);
ac1b3d12	198	}
ac1b3d12	199	}
48932677 NTND	200
48932677 NTND	201	strbuf_release(&base);
ac1b3d12 LT	202	return 0;
	203	}
	204
750f7b66 LT	205	/*
	206	* Does it look like the resulting diff might be due to a rename?
	207	* - single entry
	208	* - not a valid previous file
	209	*/
	210	static inline int diff_might_be_rename(void)
	211	{
	212	return diff_queued_diff.nr == 1 &&
	213	!DIFF_FILE_VALID(diff_queued_diff.queue[0]->one);
	214	}
	215
	216	static void try_to_follow_renames(struct tree_desc t1, struct tree_desc t2, const char base, struct diff_options opt)
	217	{
	218	struct diff_options diff_opts;
9f38e1ef LT	219	struct diff_queue_struct *q = &diff_queued_diff;
9f38e1ef LT	220	struct diff_filepair *choice;
750f7b66 LT	221	int i;
750f7b66 LT	222
8f4f8f45 NTND	223	/*
	224	* follow-rename code is very specific, we need exactly one
	225	* path. Magic that matches more than one path is not
	226	* supported.
	227	*/
5c6933d2	228	GUARD_PATHSPEC(&opt->pathspec, PATHSPEC_FROMTOP \| PATHSPEC_LITERAL);
8f4f8f45 NTND	229	#if 0
	230	/*
	231	* We should reject wildcards as well. Unfortunately we
	232	* haven't got a reliable way to detect that 'foo\*bar' in
	233	* fact has no wildcards. nowildcard_len is merely a hint for
	234	* optimization. Let it slip for now until wildmatch is taught
	235	* about dry-run mode and returns wildcard info.
	236	*/
	237	if (opt->pathspec.has_wildcard)
	238	die("BUG:%s:%d: wildcards are not supported",
	239	__FILE__, __LINE__);
	240	#endif
	241
9f38e1ef LT	242	/* Remove the file creation entry from the diff queue, and remember it */
	243	choice = q->queue[0];
	244	q->nr = 0;
	245
750f7b66	246	diff_setup(&diff_opts);
8f67f8ae	247	DIFF_OPT_SET(&diff_opts, RECURSIVE);
0cdca133	248	DIFF_OPT_SET(&diff_opts, FIND_COPIES_HARDER);
750f7b66	249	diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
61588ccf	250	diff_opts.single_follow = opt->pathspec.items[0].match;
6dd4b66f	251	diff_opts.break_opt = opt->break_opt;
dd98d88b	252	diff_opts.rename_score = opt->rename_score;
28452655	253	diff_setup_done(&diff_opts);
750f7b66 LT	254	diff_tree(t1, t2, base, &diff_opts);
750f7b66 LT	255	diffcore_std(&diff_opts);
bd1928df	256	free_pathspec(&diff_opts.pathspec);
750f7b66	257
9f38e1ef	258	/* Go through the new set of filepairing, and see if we find a more interesting one */
44c48a90	259	opt->found_follow = 0;
9f38e1ef LT	260	for (i = 0; i < q->nr; i++) {
9f38e1ef LT	261	struct diff_filepair *p = q->queue[i];
750f7b66 LT	262
	263	/*
	264	* Found a source? Not only do we use that for the new
9f38e1ef	265	* diff_queued_diff, we will also use that as the path in
750f7b66 LT	266	* the future!
750f7b66 LT	267	*/
66f13625	268	if ((p->status == 'R' \|\| p->status == 'C') &&
61588ccf	269	!strcmp(p->two->path, opt->pathspec.items[0].match)) {
9a087274 NTND	270	const char *path[2];
9a087274 NTND	271
9f38e1ef LT	272	/* Switch the file-pairs around */
	273	q->queue[i] = choice;
	274	choice = p;
	275
	276	/* Update the path we use from now on.. */
9a087274 NTND	277	path[0] = p->one->path;
9a087274 NTND	278	path[1] = NULL;
bd1928df	279	free_pathspec(&opt->pathspec);
4a2d5ae2 NTND	280	parse_pathspec(&opt->pathspec,
	281	PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
	282	PATHSPEC_LITERAL_PATH, "", path);
44c48a90 JH	283
	284	/*
	285	* The caller expects us to return a set of vanilla
	286	* filepairs to let a later call to diffcore_std()
	287	* it makes to sort the renames out (among other
	288	* things), but we already have found renames
	289	* ourselves; signal diffcore_std() not to muck with
	290	* rename information.
	291	*/
	292	opt->found_follow = 1;
750f7b66 LT	293	break;
	294	}
	295	}
	296
	297	/*
3ea3c215	298	* Then, discard all the non-relevant file pairs...
9f38e1ef LT	299	*/
	300	for (i = 0; i < q->nr; i++) {
	301	struct diff_filepair *p = q->queue[i];
	302	diff_free_filepair(p);
	303	}
	304
	305	/*
	306	* .. and re-instate the one we want (which might be either the
	307	* original one, or the rename/copy we found)
750f7b66	308	*/
9f38e1ef LT	309	q->queue[0] = choice;
9f38e1ef LT	310	q->nr = 1;
750f7b66 LT	311	}
750f7b66 LT	312
ac1b3d12 LT	313	int diff_tree_sha1(const unsigned char old, const unsigned char new, const char base, struct diff_options opt)
	314	{
	315	void tree1, tree2;
	316	struct tree_desc t1, t2;
6fda5e51	317	unsigned long size1, size2;
ac1b3d12 LT	318	int retval;
ac1b3d12 LT	319
79130328 KS	320	tree1 = fill_tree_descriptor(&t1, old);
	321	tree2 = fill_tree_descriptor(&t2, new);
	322	size1 = t1.size;
	323	size2 = t2.size;
ac1b3d12	324	retval = diff_tree(&t1, &t2, base, opt);
39f75d26	325	if (!*base && DIFF_OPT_TST(opt, FOLLOW_RENAMES) && diff_might_be_rename()) {
750f7b66 LT	326	init_tree_desc(&t1, tree1, size1);
	327	init_tree_desc(&t2, tree2, size2);
	328	try_to_follow_renames(&t1, &t2, base, opt);
	329	}
ac1b3d12 LT	330	free(tree1);
	331	free(tree2);
	332	return retval;
	333	}
	334
2b60356d RS	335	int diff_root_tree_sha1(const unsigned char new, const char base, struct diff_options *opt)
2b60356d RS	336	{
0b707c33	337	return diff_tree_sha1(NULL, new, base, opt);
2b60356d	338	}