X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=write-tree.c;h=e2bbbd261e76800df8882c2bb9f15dda953804d2;hb=6cbd72f8d5d794112eab68f7e7222c9a0c5d6587;hp=7eac1df8fb6c7ea7f5da7ab91405d26eda6c03c1;hpb=121481abf8d752ef871821d4ab9a3747595d86ae;p=git.git

diff --git a/write-tree.c b/write-tree.c
index 7eac1df8..e2bbbd26 100644
--- a/write-tree.c
+++ b/write-tree.c
@@ -45,7 +45,7 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
 	do {
 		struct cache_entry *ce = cachep[nr];
 		const char *pathname = ce->name, *filename, *dirname;
-		int pathlen = ce->namelen, entrylen;
+		int pathlen = ce_namelen(ce), entrylen;
 		unsigned char *sha1;
 		unsigned int mode;
 
@@ -54,7 +54,7 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
 			break;
 
 		sha1 = ce->sha1;
-		mode = ce->st_mode;
+		mode = ntohl(ce->ce_mode);
 
 		/* Do we have _further_ subdirectories? */
 		filename = pathname + baselen;
@@ -106,9 +106,9 @@ int main(int argc, char **argv)
 	unsigned char sha1[20];
 
 	if (entries <= 0)
-		usage("no cache contents to write");
+		die("write-tree: no cache contents to write");
 	if (write_tree(active_cache, entries, "", 0, sha1) != entries)
-		usage("write-tree: internal error");
+		die("write-tree: internal error");
 	printf("%s\n", sha1_to_hex(sha1));
 	return 0;
 }