From: Jan Harkes <jaharkes@cs.cmu.edu>
Date: Sat, 25 Jun 2005 18:23:36 +0000 (-0400)
Subject: [PATCH] git-write-tree doesn't check alternate directories
X-Git-Tag: v0.99~192
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7323aa11af1527d5a786d93ee34401c72c5df051;p=git.git

[PATCH] git-write-tree doesn't check alternate directories

git-write-tree failed when referenced objects only exist in the
GIT_ALTERNATE_OBJECT_DIRECTORIES path.

Signed-off-by: Jan Harkes <jaharkes@cs.cmu.edu>
Acked-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/write-tree.c b/write-tree.c
index b8bf8831e..a794ea15b 100644
--- a/write-tree.c
+++ b/write-tree.c
@@ -7,14 +7,13 @@
 
 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)