projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revision arguments: ..B means HEAD..B, just like A.. means A..HEAD
[git.git]
/
tree-diff.c
diff --git
a/tree-diff.c
b/tree-diff.c
index
0ef06a9
..
d978428
100644
(file)
--- a/
tree-diff.c
+++ b/
tree-diff.c
@@
-9,7
+9,7
@@
static int nr_paths = 0;
static const char **paths = NULL;
static int *pathlens = NULL;
static const char **paths = NULL;
static int *pathlens = NULL;
-
static
void update_tree_entry(struct tree_desc *desc)
+void update_tree_entry(struct tree_desc *desc)
{
void *buf = desc->buf;
unsigned long size = desc->size;
{
void *buf = desc->buf;
unsigned long size = desc->size;
@@
-21,7
+21,7
@@
static void update_tree_entry(struct tree_desc *desc)
desc->size = size - len;
}
desc->size = size - len;
}
-
static const unsigned char *
extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
+
const unsigned char *tree_entry_
extract(struct tree_desc *desc, const char **pathp, unsigned int *modep)
{
void *tree = desc->buf;
unsigned long size = desc->size;
{
void *tree = desc->buf;
unsigned long size = desc->size;
@@
-56,8
+56,8
@@
static int compare_tree_entry(struct tree_desc *t1, struct tree_desc *t2, const
const unsigned char *sha1, *sha2;
int cmp, pathlen1, pathlen2;
const unsigned char *sha1, *sha2;
int cmp, pathlen1, pathlen2;
- sha1 = extract(t1, &path1, &mode1);
- sha2 = extract(t2, &path2, &mode2);
+ sha1 =
tree_entry_
extract(t1, &path1, &mode1);
+ sha2 =
tree_entry_
extract(t2, &path2, &mode2);
pathlen1 = strlen(path1);
pathlen2 = strlen(path2);
pathlen1 = strlen(path1);
pathlen2 = strlen(path2);
@@
-109,7
+109,7
@@
static int interesting(struct tree_desc *desc, const char *base)
if (!nr_paths)
return 1;
if (!nr_paths)
return 1;
- (void)extract(desc, &path, &mode);
+ (void)
tree_entry_
extract(desc, &path, &mode);
pathlen = strlen(path);
baselen = strlen(base);
pathlen = strlen(path);
baselen = strlen(base);
@@
-167,7
+167,7
@@
static int show_entry(struct diff_options *opt, const char *prefix, struct tree_
{
unsigned mode;
const char *path;
{
unsigned mode;
const char *path;
- const unsigned char *sha1 = extract(desc, &path, &mode);
+ const unsigned char *sha1 =
tree_entry_
extract(desc, &path, &mode);
if (opt->recursive && S_ISDIR(mode)) {
char type[20];
if (opt->recursive && S_ISDIR(mode)) {
char type[20];
@@
-263,6
+263,10
@@
void diff_tree_setup_paths(const char **p)
paths = p;
nr_paths = count_paths(paths);
paths = p;
nr_paths = count_paths(paths);
+ if (nr_paths == 0) {
+ pathlens = NULL;
+ return;
+ }
pathlens = xmalloc(nr_paths * sizeof(int));
for (i=0; i<nr_paths; i++)
pathlens[i] = strlen(paths[i]);
pathlens = xmalloc(nr_paths * sizeof(int));
for (i=0; i<nr_paths; i++)
pathlens[i] = strlen(paths[i]);