diff --git a/write-tree.c b/write-tree.c
index 881c8c2b5821475b41c77ed3e44b385949fbffc0..827809dbddbff6dd8cf842641f6db5ad2f3ae07a 100644 (file)
--- a/write-tree.c
+++ b/write-tree.c
do {
struct cache_entry *ce = cachep[nr];
const char *pathname = ce->name, *filename, *dirname;
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;
unsigned char *sha1;
unsigned int mode;
break;
sha1 = ce->sha1;
break;
sha1 = ce->sha1;
- mode = ce->st_mode;
+ mode = ntohl(ce->ce_mode);
/* Do we have _further_ subdirectories? */
filename = pathname + baselen;
/* Do we have _further_ subdirectories? */
filename = pathname + baselen;
@@ -93,20 +93,36 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
i -= 5;
memcpy(buffer+i, "tree ", 5);
i -= 5;
memcpy(buffer+i, "tree ", 5);
- buffer += i;
- offset -= i;
-
- write_sha1_file(buffer, offset, returnsha1);
+ write_sha1_file(buffer + i, offset - i, returnsha1);
+ free(buffer);
return nr;
}
int main(int argc, char **argv)
{
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");
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));
if (write_tree(active_cache, entries, "", 0, sha1) != entries)
die("write-tree: internal error");
printf("%s\n", sha1_to_hex(sha1));