date.c: use the local timezone if none specified

diff --git a/write-tree.c b/write-tree.c
index 881c8c2b5821475b41c77ed3e44b385949fbffc0..168352853d37bdca71d68ad8312b87b84477dea1 100644 (file)
--- a/write-tree.c
+++ b/write-tree.c
@@ -17,35 +17,23 @@ static int check_valid_sha1(unsigned char *sha1)
        return ret;
 }
 
-static int prepend_integer(char *buffer, unsigned val, int i)
-{
-       buffer[--i] = '\0';
-       do {
-               buffer[--i] = '0' + (val % 10);
-               val /= 10;
-       } while (val);
-       return i;
-}
-
-#define ORIG_OFFSET (40)       /* Enough space to add the header of "tree <size>\0" */
-
 static int write_tree(struct cache_entry **cachep, int maxentries, const char *base, int baselen, unsigned char *returnsha1)
 {
        unsigned char subdir_sha1[20];
        unsigned long size, offset;
        char *buffer;
-       int i, nr;
+       int nr;
 
        /* Guess at some random initial size */
        size = 8192;
-       buffer = malloc(size);
-       offset = ORIG_OFFSET;
+       buffer = xmalloc(size);
+       offset = 0;
 
        nr = 0;
        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 +42,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;
@@ -80,7 +68,7 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
                entrylen = pathlen - baselen;
                if (offset + entrylen + 100 > size) {
                        size = alloc_nr(offset + entrylen + 100);
-                       buffer = realloc(buffer, size);
+                       buffer = xrealloc(buffer, size);
                }
                offset += sprintf(buffer + offset, "%o %.*s", mode, entrylen, filename);
                buffer[offset++] = 0;
@@ -89,24 +77,36 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
                nr++;
        } while (nr < maxentries);
 
-       i = prepend_integer(buffer, offset - ORIG_OFFSET, ORIG_OFFSET);
-       i -= 5;
-       memcpy(buffer+i, "tree ", 5);
-
-       buffer += i;
-       offset -= i;
-
-       write_sha1_file(buffer, offset, returnsha1);
+       write_sha1_file(buffer, offset, "tree", returnsha1);
+       free(buffer);
        return nr;
 }
 
 int main(int argc, char **argv)
 {
+       int i, unmerged;
        int entries = read_cache();
        unsigned char sha1[20];
 
        if (entries <= 0)
                die("write-tree: no cache contents to write");
+
+       /* Verify that the tree is merged */
+       unmerged = 0;
+       for (i = 0; i < entries; i++) {
+               struct cache_entry *ce = active_cache[i];
+               if (ntohs(ce->ce_flags) & ~CE_NAMEMASK) {
+                       if (++unmerged > 10) {
+                               fprintf(stderr, "...\n");
+                               break;
+                       }
+                       fprintf(stderr, "%s: unmerged (%s)\n", ce->name, sha1_to_hex(ce->sha1));
+               }
+       }
+       if (unmerged)
+               die("write-tree: not able to write tree");
+
+       /* Ok, write it out */
        if (write_tree(active_cache, entries, "", 0, sha1) != entries)
                die("write-tree: internal error");
        printf("%s\n", sha1_to_hex(sha1));