projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make 'fsck' able to take an arbitrary number of parents on the
[git.git]
/
diff-tree.c
diff --git
a/diff-tree.c
b/diff-tree.c
index
5cf6057
..
da50e57
100644
(file)
--- a/
diff-tree.c
+++ b/
diff-tree.c
@@
-11,7
+11,7
@@
static void update_tree_entry(void **bufp, unsigned long *sizep)
int len = strlen(buf) + 1 + 20;
if (size < len)
int len = strlen(buf) + 1 + 20;
if (size < len)
-
usag
e("corrupt tree file");
+
di
e("corrupt tree file");
*bufp = buf + len;
*sizep = size - len;
}
*bufp = buf + len;
*sizep = size - len;
}
@@
-23,7
+23,7
@@
static const unsigned char *extract(void *tree, unsigned long size, const char *
const char *path = strchr(tree, ' ');
if (!path || size < len + 20 || sscanf(tree, "%o", modep) != 1)
const char *path = strchr(tree, ' ');
if (!path || size < len + 20 || sscanf(tree, "%o", modep) != 1)
-
usag
e("corrupt tree file");
+
di
e("corrupt tree file");
*pathp = path+1;
return sha1;
}
*pathp = path+1;
return sha1;
}
@@
-64,7
+64,7
@@
static void show_file(const char *prefix, void *tree, unsigned long size, const
tree = read_sha1_file(sha1, type, &size);
if (!tree || strcmp(type, "tree"))
tree = read_sha1_file(sha1, type, &size);
if (!tree || strcmp(type, "tree"))
-
usag
e("corrupt tree sha %s", sha1_to_hex(sha1));
+
di
e("corrupt tree sha %s", sha1_to_hex(sha1));
show_tree(prefix, tree, size, newbase);
show_tree(prefix, tree, size, newbase);
@@
-73,7
+73,9
@@
static void show_file(const char *prefix, void *tree, unsigned long size, const
return;
}
return;
}
- printf("%s%o %s %s%s%c", prefix, mode, sha1_to_hex(sha1), base, path, 0);
+ printf("%s%o\t%s\t%s\t%s%s%c", prefix, mode,
+ S_ISDIR(mode) ? "tree" : "blob",
+ sha1_to_hex(sha1), base, path, 0);
}
static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
}
static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, unsigned long size2, const char *base)
@@
-103,7
+105,7
@@
static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
/*
* If the filemode has changed to/from a directory from/to a regular
/*
* If the filemode has changed to/from a directory from/to a regular
- * file, we need to consider it a remove and an add.
+ * file, we need to consider it a remove and an add.
*/
if (S_ISDIR(mode1) != S_ISDIR(mode2)) {
show_file("-", tree1, size1, base);
*/
if (S_ISDIR(mode1) != S_ISDIR(mode2)) {
show_file("-", tree1, size1, base);
@@
-120,7
+122,9
@@
static int compare_tree_entry(void *tree1, unsigned long size1, void *tree2, uns
}
strcpy(old_sha1_hex, sha1_to_hex(sha1));
}
strcpy(old_sha1_hex, sha1_to_hex(sha1));
- printf("*%o->%o %s->%s %s%s%c", mode1, mode2, old_sha1_hex, sha1_to_hex(sha2), base, path1, 0);
+ printf("*%o->%o\t%s\t%s->%s\t%s%s%c", mode1, mode2,
+ S_ISDIR(mode1) ? "tree" : "blob",
+ old_sha1_hex, sha1_to_hex(sha2), base, path1, 0);
return 0;
}
return 0;
}
@@
-148,7
+152,7
@@
static int diff_tree(void *tree1, unsigned long size1, void *tree2, unsigned lon
update_tree_entry(&tree2, &size2);
continue;
}
update_tree_entry(&tree2, &size2);
continue;
}
-
usag
e("diff-tree: internal error");
+
di
e("diff-tree: internal error");
}
return 0;
}
}
return 0;
}
@@
-162,10
+166,10
@@
static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co
tree1 = read_sha1_file(old, type, &size1);
if (!tree1 || strcmp(type, "tree"))
tree1 = read_sha1_file(old, type, &size1);
if (!tree1 || strcmp(type, "tree"))
-
usage("unable to read source tree"
);
+
die("unable to read source tree (%s)", sha1_to_hex(old)
);
tree2 = read_sha1_file(new, type, &size2);
if (!tree2 || strcmp(type, "tree"))
tree2 = read_sha1_file(new, type, &size2);
if (!tree2 || strcmp(type, "tree"))
-
usage("unable to read destination tree"
);
+
die("unable to read destination tree (%s)", sha1_to_hex(new)
);
retval = diff_tree(tree1, size1, tree2, size2, base);
free(tree1);
free(tree2);
retval = diff_tree(tree1, size1, tree2, size2, base);
free(tree1);
free(tree2);
@@
-180,11
+184,11
@@
int main(int argc, char **argv)
char *arg = argv[1];
argv++;
argc--;
char *arg = argv[1];
argv++;
argc--;
- if (!strcmp(arg, "-
R
")) {
+ if (!strcmp(arg, "-
r
")) {
recursive = 1;
continue;
}
recursive = 1;
continue;
}
- usage("diff-tree [-
R
] <tree sha1> <tree sha1>");
+ usage("diff-tree [-
r
] <tree sha1> <tree sha1>");
}
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))