From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sat, 9 Apr 2005 18:24:41 +0000 (-0700)
Subject: Fix "checkout-cache.c" mis-use of read_sha1_file() interface.
X-Git-Tag: v0.99~938
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8d3af1d53255ac36494492720ebb83e932b0c0bc;p=git.git

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.
---

diff --git a/checkout-cache.c b/checkout-cache.c
index 1b50da8f1..6baf4f21b 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;