diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-09 11:24:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-09 11:24:41 -0700 |
| commit | 8d3af1d53255ac36494492720ebb83e932b0c0bc (patch) | |
| tree | 09c369f30a7ec350dc98496c5cb752280f6dfe51 | |
| parent | Fix up "checkout-cache" a bit (diff) | |
| download | tgif-8d3af1d53255ac36494492720ebb83e932b0c0bc.tar.xz | |
Fix "checkout-cache.c" mis-use of read_sha1_file() interface.
It's supposed to test the returned file type, not think that read_sha1_file()
tests it. Confusion from "cat-file" command line usage.
| -rw-r--r-- | checkout-cache.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/checkout-cache.c b/checkout-cache.c index 1b50da8f1a..6baf4f21b2 100644 --- a/checkout-cache.c +++ b/checkout-cache.c @@ -42,9 +42,10 @@ static int write_entry(struct cache_entry *ce) void *new; unsigned long size; long wrote; + char type[20]; - new = read_sha1_file(ce->sha1, "blob", &size); - if (!new) { + new = read_sha1_file(ce->sha1, type, &size); + if (!new || strcmp(type, "blob")) { fprintf(stderr, "checkout-cache: unable to read sha1 file of %s (%s)\n", ce->name, sha1_to_hex(ce->sha1)); return -1; |