mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Prepare diffcore interface for diff-tree header supression.

Browse Source 
This does not actually supress the extra headers when pickaxe is
used, but prepares enough support for diff-tree to implement it.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Junio C Hamano
2005-05-21 19:40:36 -07:00
committed by Linus Torvalds
parent 58b103f55d
commit 38c6f78059
9 changed files with 71 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
diff-tree.c
View File

@ -267,16 +267,28 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
return retval;
}
static void call_diff_setup(void)
{
diff_setup(reverse_diff, (generate_patch ? -1 : line_termination));
}
static void call_diff_flush(void)
{
if (detect_rename)
diff_detect_rename(detect_rename, diff_score_opt);
if (pickaxe)
diff_pickaxe(pickaxe);
diff_flush(NULL, 0);
}
static int diff_tree_sha1_top(const unsigned char *old,
const unsigned char *new, const char *base)
{
int ret;
diff_setup(detect_rename, diff_score_opt, pickaxe,
reverse_diff, (generate_patch ? -1 : line_termination),
NULL, 0);
call_diff_setup();
ret = diff_tree_sha1(old, new, base);
diff_flush();
call_diff_flush();
return ret;
}
@ -286,15 +298,13 @@ static int diff_root_tree(const unsigned char *new, const char *base)
void *tree;
unsigned long size;
diff_setup(detect_rename, diff_score_opt, pickaxe,
reverse_diff, (generate_patch ? -1 : line_termination),
NULL, 0);
call_diff_setup();
tree = read_object_with_reference(new, "tree", &size, NULL);
if (!tree)
die("unable to read root tree (%s)", sha1_to_hex(new));
retval = diff_tree("", 0, tree, size, base);
free(tree);
diff_flush();
call_diff_flush();
return retval;
}