[PATCH] git-tar-tree: add a test case

[git.git] / write-tree.c

diff --git a/write-tree.c b/write-tree.c
index 19b6ee5..b8bf883 100644 (file)
--- a/write-tree.c
+++ b/write-tree.c
@@ -30,7 +30,7 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
        offset = 0;
 
        nr = 0;
-       do {
+       while (nr < maxentries) {
                struct cache_entry *ce = cachep[nr];
                const char *pathname = ce->name, *filename, *dirname;
                int pathlen = ce_namelen(ce), entrylen;
@@ -75,7 +75,7 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
                memcpy(buffer + offset, sha1, 20);
                offset += 20;
                nr++;
-       } while (nr < maxentries);
+       }
 
        write_sha1_file(buffer, offset, "tree", returnsha1);
        free(buffer);
@@ -88,8 +88,8 @@ int main(int argc, char **argv)
        int entries = read_cache();
        unsigned char sha1[20];
 
-       if (entries <= 0)
-               die("write-tree: no cache contents to write");
+       if (entries < 0)
+               die("git-write-tree: error reading cache");
 
        /* Verify that the tree is merged */
        funny = 0;
@@ -104,7 +104,7 @@ int main(int argc, char **argv)
                }
        }
        if (funny)
-               die("write-tree: not able to write tree");
+               die("git-write-tree: not able to write tree");
 
        /* Also verify that the cache does not have path and path/file
         * at the same time.  At this point we know the cache has only
@@ -131,11 +131,11 @@ int main(int argc, char **argv)
                }
        }
        if (funny)
-               die("write-tree: not able to write tree");
+               die("git-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");
+               die("git-write-tree: internal error");
        printf("%s\n", sha1_to_hex(sha1));
        return 0;
 }