X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=fetch.c;h=3e073d3584c25e35da0163689508599659328605;hb=25f6f325d7a8f7cb686a9ffd9fa2c00b3aa85a60;hp=62f30d1055af41fb9b4bb06c36f38065a840d768;hpb=a95cb6fb6b247cf90bd0b1a8bf989a0b42ada775;p=git.git

diff --git a/fetch.c b/fetch.c
index 62f30d10..3e073d35 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) 
@@ -48,6 +49,7 @@ static int process_tree(struct tree *tree)
 		struct tree_entry_list *next = entry->next;
 		if (process(entry->item.any))
 			return -1;
+		free(entry->name);
 		free(entry);
 		entry = next;
 	}
@@ -213,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",