diff --git a/write-tree.c b/write-tree.c
index f6358d76f1301dc2933e7cf1c3d9bc77ac123b06..b58871c7d9e7b3a3772831f2f9df04268e908987 100644 (file)
--- a/write-tree.c
+++ b/write-tree.c
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;
break;
sha1 = ce->sha1;
- mode = ce->st_mode;
+ mode = ntohl(ce->ce_mode);
/* Do we have _further_ subdirectories? */
filename = pathname + baselen;
int subdir_written;
subdir_written = write_tree(cachep + nr, maxentries - nr, pathname, dirname-pathname+1, subdir_sha1);
- fprintf(stderr, "Wrote %d entries from subdirectory '%.*s'\n",
- subdir_written, dirname-pathname, pathname);
nr += subdir_written;
/* Now we need to write out the directory entry into this tree.. */
@@ -104,13 +102,31 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
int main(int argc, char **argv)
{
+ int i, unmerged;
int entries = read_cache();
unsigned char sha1[20];
if (entries <= 0)
- usage("no cache contents to write");
+ 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)
- usage("write-tree: internal error");
+ die("write-tree: internal error");
printf("%s\n", sha1_to_hex(sha1));
return 0;
}