X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=tar-tree.c;h=bacb23ae6365767dfdc93c6041aa9f3cb673b27b;hb=ee34518d629331dadd58b1a75294369d679eda8b;hp=a877fe545e74511a905f803564e51158da68d0d1;hpb=4d1f11903393bd79998144ce1089ce427a49a2ed;p=git.git

diff --git a/tar-tree.c b/tar-tree.c
index a877fe54..bacb23ae 100644
--- a/tar-tree.c
+++ b/tar-tree.c
@@ -325,8 +325,8 @@ static void write_header(const unsigned char *sha1, char typeflag, const char *b
 	memcpy(&header[257], "ustar", 6);
 	memcpy(&header[263], "00", 2);
 
-	printf(&header[329], "%07o", 0);	/* devmajor */
-	printf(&header[337], "%07o", 0);	/* devminor */
+	sprintf(&header[329], "%07o", 0);	/* devmajor */
+	sprintf(&header[337], "%07o", 0);	/* devminor */
 
 	memset(&header[148], ' ', 8);
 	for (i = 0; i < RECORDSIZE; i++)
@@ -353,6 +353,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 +407,8 @@ int main(int argc, char **argv)
 	void *buffer;
 	unsigned long size;
 
+	setup_git_directory();
+
 	switch (argc) {
 	case 3:
 		basedir = argv[2];