X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=write-tree.c;h=d801d7fbe9cdec01e410546ce27a76aba98692f0;hb=92747a907cba83938def6e7eb3ee1b4d3d9e609f;hp=168352853d37bdca71d68ad8312b87b84477dea1;hpb=812666c8e66a21e668c0789d0422aa5a7db54961;p=git.git

diff --git a/write-tree.c b/write-tree.c
index 16835285..d801d7fb 100644
--- 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("write-tree: error reading cache");
 
 	/* Verify that the tree is merged */
 	unmerged = 0;