mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-23 21:22:15 +02:00
Code

git-convert-cache: fix up file modes in trees too

Browse Source 
git-fsck-cache complains about some of the odder ones, and is quiet
about the old (S_IFREG | 664) case, but that's wrong too.

Converting the kernel tree is too painful right now, but at least we
know how to do it if we ever want to.
This commit is contained in:
Linus Torvalds 2005-07-16 09:57:03 -07:00
parent 0c04094bc1
commit e2418c01b1
1 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
convert-cache.c
View File

@ -116,6 +116,34 @@ static int write_subdirectory(void *buffer, unsigned long size, const char *base
return used;
}
static int convert_mode(char *buffer)
{
char *end;
unsigned short mode = strtoul(buffer, &end, 8);
unsigned short newmode;
char num[10];
int len;
if (*end != ' ')
die("corrupt tree object");
switch (mode) {
case S_IFREG | 0644:
case S_IFREG | 0755:
case S_IFLNK:
case S_IFDIR:
return 0;
}
newmode = 0;
if (S_ISREG(mode))
newmode = (mode & 0100) ? 0755 : 0644;
newmode |= mode & S_IFMT;
len = sprintf(num, "%o", newmode);
if (len != end - buffer)
return error("unable to convert tree entry mode %o to %o", mode, newmode);
memcpy(buffer, num, len);
return 0;
}
static void convert_tree(void *buffer, unsigned long size, unsigned char *result_sha1)
{
void *orig_buffer = buffer;
@ -124,6 +152,7 @@ static void convert_tree(void *buffer, unsigned long size, unsigned char *result
while (size) {
int len = 1+strlen(buffer);
convert_mode(buffer);
convert_binary_sha1(buffer + len);
len += 20;