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

[PATCH] Teach diff-tree about commit objects

Browse Source 
Updates diff-tree.c to use read_tree_with_tree_or_commit_sha1()
function.  The command can take either tree or commit IDs with this patch.

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-04-20 18:06:50 -07:00
committed by Linus Torvalds
parent 38357e6703
commit c1fdf2a6ab
1 changed files with 4 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
diff-tree.c
View File

@ -164,14 +164,13 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
{ {
void *tree1, *tree2; void *tree1, *tree2;
unsigned long size1, size2; unsigned long size1, size2;
char type[20];
int retval; int retval;
tree1 = read_sha1_file(old, type, &size1); tree1 = read_tree_with_tree_or_commit_sha1(old, &size1, 0);
if (!tree1 || strcmp(type, "tree")) if (!tree1)
die("unable to read source tree (%s)", sha1_to_hex(old)); die("unable to read source tree (%s)", sha1_to_hex(old));
tree2 = read_sha1_file(new, type, &size2); tree2 = read_tree_with_tree_or_commit_sha1(new, &size2, 0);
if (!tree2 || strcmp(type, "tree")) if (!tree2)
die("unable to read destination tree (%s)", sha1_to_hex(new)); die("unable to read destination tree (%s)", sha1_to_hex(new));
retval = diff_tree(tree1, size1, tree2, size2, base); retval = diff_tree(tree1, size1, tree2, size2, base);
free(tree1); free(tree1);
@ -179,20 +178,6 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
return retval; return retval;
} }
static void commit_to_tree(unsigned char *sha1)
{
void *buf;
char type[20];
unsigned long size;
buf = read_sha1_file(sha1, type, &size);
if (buf) {
if (!strcmp(type, "commit"))
get_sha1_hex(buf+5, sha1);
free(buf);
}
}
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
unsigned char old[20], new[20]; unsigned char old[20], new[20];
@ -214,7 +199,5 @@ int main(int argc, char **argv)
if (argc != 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new)) if (argc != 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new))
usage("diff-tree <tree sha1> <tree sha1>"); usage("diff-tree <tree sha1> <tree sha1>");
commit_to_tree(old);
commit_to_tree(new);
return diff_tree_sha1(old, new, ""); return diff_tree_sha1(old, new, "");
} }