diff --git a/write-tree.c b/write-tree.c
index 19b6ee5ea3bf17b81a22c0f76ae5da85998552d3..a794ea15b89ece14570bb8bf3ed0b42ab65cd413 100644 (file)
--- a/write-tree.c
+++ b/write-tree.c
static int check_valid_sha1(unsigned char *sha1)
{
- char *filename = sha1_file_name(sha1);
int ret;
/* If we were anal, we'd check that the sha1 of the contents actually matches */
- ret = access(filename, R_OK);
- if (ret)
- perror(filename);
- return ret;
+ ret = has_sha1_file(sha1);
+ if (ret == 0)
+ perror(sha1_file_name(sha1));
+ return ret ? 0 : -1;
}
static int write_tree(struct cache_entry **cachep, int maxentries, const char *base, int baselen, unsigned char *returnsha1)
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;
memcpy(buffer + offset, sha1, 20);
offset += 20;
nr++;
- } while (nr < maxentries);
+ }
write_sha1_file(buffer, offset, "tree", returnsha1);
free(buffer);
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;
}
}
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
}
}
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;
}