diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-03 21:34:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-03 21:36:38 -0800 |
| commit | 473d404b53488a17458beea81913c1bc5df47a8a (patch) | |
| tree | 0324bfaef8a82f91e83170898e1325e1227937c9 | |
| parent | 1142038098810a69e57d88554559e4e6116df177 (diff) | |
| download | git-473d404b53488a17458beea81913c1bc5df47a8a.tar.gz git-473d404b53488a17458beea81913c1bc5df47a8a.tar.xz | |
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>
| -rw-r--r-- | tar-tree.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tar-tree.c b/tar-tree.c index e85a1ed66..e478e13e2 100644 --- 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; |