From: Junio C Hamano <junkio@cox.net>
Date: Sun, 18 Sep 2005 21:11:53 +0000 (-0700)
Subject: fetch() assumes we do not have the object.
X-Git-Tag: v0.99.7~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=029f6de377c7e0484f5c4cf070934599580f1784;p=git.git

fetch() assumes we do not have the object.

Bugfix for the previous one.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/fetch.c b/fetch.c
index 1d95ce0cc..af9a013bd 100644
--- a/fetch.c
+++ b/fetch.c
@@ -174,7 +174,7 @@ static int loop(void)
 		 * the queue because we needed to fetch it first.
 		 */
 		if (! (obj->flags & TO_SCAN)) {
-			if (fetch(obj->sha1)) {
+			if (!has_sha1_file(obj->sha1) && fetch(obj->sha1)) {
 				report_missing(obj->type
 					       ? obj->type
 					       : "object", obj->sha1);