Simplify show-diff cache entry name handling.

[git.git] / write-tree.c

diff --git a/write-tree.c b/write-tree.c
index 7eac1df..e2bbbd2 100644 (file)
--- 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;
 }