X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tar-tree.c;h=96bd1438d9033e5bca3841fb85a531ea27070faf;hb=9470657ad0d0472e3e3c2e352334f60e7bd777c1;hp=2716ae3eb1430abfc43d980d904fc192f8dcbbf4;hpb=e8c80638abc99928dba9ac832589749a531e2e21;p=git.git

diff --git a/tar-tree.c b/tar-tree.c
index 2716ae3e..96bd1438 100644
--- a/tar-tree.c
+++ b/tar-tree.c
@@ -34,10 +34,8 @@ struct path_prefix {
 static void reliable_write(void *buf, unsigned long size)
 {
 	while (size > 0) {
-		long ret = write(1, buf, size);
+		long ret = xwrite(1, buf, size);
 		if (ret < 0) {
-			if (errno == EAGAIN)
-				continue;
 			if (errno == EPIPE)
 				exit(0);
 			die("git-tar-tree: %s", strerror(errno));
@@ -353,6 +351,8 @@ static void traverse_tree(void *buffer, unsigned long size,
 
 		if (size < namelen + 20 || sscanf(buffer, "%o", &mode) != 1)
 			die("corrupt 'tree' file");
+		if (S_ISDIR(mode) || S_ISREG(mode))
+			mode |= (mode & 0100) ? 0777 : 0666;
 		buffer = sha1 + 20;
 		size -= namelen + 20;
 
@@ -405,6 +405,8 @@ int main(int argc, char **argv)
 	void *buffer;
 	unsigned long size;
 
+	setup_git_directory();
+
 	switch (argc) {
 	case 3:
 		basedir = argv[2];