projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This implements the new "recursive tree" write-tree.
[git.git]
/
fsck-cache.c
diff --git
a/fsck-cache.c
b/fsck-cache.c
index
ac348b7
..
c35acaa
100644
(file)
--- a/
fsck-cache.c
+++ b/
fsck-cache.c
@@
-20,15
+20,25
@@
static int mark_sha1_seen(unsigned char *sha1, char *tag)
static int fsck_tree(unsigned char *sha1, void *data, unsigned long size)
{
static int fsck_tree(unsigned char *sha1, void *data, unsigned long size)
{
+ int warn_old_tree = 1;
+
while (size) {
int len = 1+strlen(data);
unsigned char *file_sha1 = data + len;
char *path = strchr(data, ' ');
while (size) {
int len = 1+strlen(data);
unsigned char *file_sha1 = data + len;
char *path = strchr(data, ' ');
- if (size < len + 20 || !path)
+ unsigned int mode;
+ if (size < len + 20 || !path || sscanf(data, "%o", &mode) != 1)
return -1;
return -1;
+
+ /* Warn about trees that don't do the recursive thing.. */
+ if (warn_old_tree && strchr(path, '/')) {
+ fprintf(stderr, "warning: fsck-cache: tree %s has full pathnames in it\n", sha1_to_hex(sha1));
+ warn_old_tree = 0;
+ }
+
data += len + 20;
size -= len + 20;
data += len + 20;
size -= len + 20;
- mark_needs_sha1(sha1, "blob", file_sha1);
+ mark_needs_sha1(sha1,
S_ISDIR(mode) ? "tree" :
"blob", file_sha1);
}
return 0;
}
}
return 0;
}