X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fetch.c;h=73bde07aeaeea67e44aef7aec1b79d5806e80a1b;hb=8824689884a5673f803d77cda499f83b84145a06;hp=1a33ae984fe999096b0e06fb66155a19be001346;hpb=d35bbe0b2e3765639c23978783a5319dfad33992;p=git.git

diff --git a/fetch.c b/fetch.c
index 1a33ae98..73bde07a 100644
--- a/fetch.c
+++ b/fetch.c
@@ -15,6 +15,7 @@ int get_tree = 0;
 int get_history = 0;
 int get_all = 0;
 int get_verbosely = 0;
+int get_recover = 0;
 static unsigned char current_commit_sha1[20];
 
 void pull_say(const char *fmt, const char *hex) 
@@ -164,7 +165,7 @@ static int loop(void)
 		 * the queue because we needed to fetch it first.
 		 */
 		if (! (obj->flags & TO_SCAN)) {
-			if (!has_sha1_file(obj->sha1) && fetch(obj->sha1)) {
+			if (fetch(obj->sha1)) {
 				report_missing(obj->type
 					       ? obj->type
 					       : "object", obj->sha1);
@@ -214,7 +215,9 @@ int pull(char *target)
 			return -1;
 	}
 
-	for_each_ref(mark_complete);
+	if (!get_recover) {
+		for_each_ref(mark_complete);
+	}
 
 	if (interpret_target(target, sha1))
 		return error("Could not interpret %s as something to pull",