Merge part of 'sp/checkout'

diff --git a/tar-tree.c b/tar-tree.c
index e85a1ed6605459fdbb60e3b24022e7e250b93a91..e478e13e283a9d9687d0b32e180558995f2b920d 100644 (file)
--- a/tar-tree.c
+++ b/tar-tree.c
@@ -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;