Browse Source

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 19 years ago
parent
commit
473d404b53
  1. 10
      tar-tree.c

10
tar-tree.c

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

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

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

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

Loading…
Cancel
Save