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
2709f06
..
da50e57
100644
(file)
--- a/
diff-tree.c
+++ b/
diff-tree.c
@@
-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)
@@
-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;
}
@@
-184,7
+188,7
@@
int main(int argc, char **argv)
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))