kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

tar-tree: file/dirmode fix. 

This fixes two bugs introduced when we switched to generic tree
traversal code.

 (1) directory mode recorded silently became 0755, not 0777

 (2) if passed a tree object (not a commit), it emitted an
     alarming error message (but proceeded anyway).

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 2006-03-03 21:34:14 -08:00
parent 1142038098
commit 473d404b53
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tar-tree.c
View File

@ -304,9 +304,11 @@ static void write_header(const unsigned char *sha1, char typeflag, const char *b
} }


if (S_ISDIR(mode)) if (S_ISDIR(mode))
mode |= 0755; /* GIT doesn't store permissions of dirs */ mode |= 0777;
if (S_ISLNK(mode)) else if (S_ISREG(mode))
mode |= 0777; /* ... nor of symlinks */ mode |= (mode & 0100) ? 0777 : 0666;
else if (S_ISLNK(mode))
mode |= 0777;
sprintf(&header[100], "%07o", mode & 07777); sprintf(&header[100], "%07o", mode & 07777);


/* XXX: should we provide more meaningful info here? */ /* XXX: should we provide more meaningful info here? */
@ -391,7 +393,7 @@ int main(int argc, char **argv)
usage(tar_tree_usage); usage(tar_tree_usage);
} }


commit = lookup_commit_reference(sha1); commit = lookup_commit_reference_gently(sha1, 1);
if (commit) { if (commit) {
write_global_extended_header(commit->object.sha1); write_global_extended_header(commit->object.sha1);
archive_time = commit->date; archive_time = commit->date;