1
0
mirror of https://github.com/git/git.git synced 2025-03-19 07:48:49 +00:00

Merge branch 'maint'

* maint:
  tar-tree: file/dirmode fix.
This commit is contained in:
Junio C Hamano 2006-03-03 21:36:52 -08:00
commit be972922d0

View File

@ -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)
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;