From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 3 Mar 2008 02:34:43 +0000 (-0500)
Subject: Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch
X-Git-Tag: v1.5.5-rc0~44^2~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7f98428d4beb24b564acbbfa779391467aab6f03;p=git.git

Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch

We can free this ref_map as soon as the fetch is complete.  It is not
used for the automatic tag following, nor is it used to disconnect the
transport.  This avoids some confusion about why we are holding onto
these refs while following tags.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-fetch.c b/builtin-fetch.c
index f8b9542ba..1348a0e95 100644
--- a/builtin-fetch.c
+++ b/builtin-fetch.c
@@ -509,7 +509,7 @@ static struct ref *find_non_local_tags(struct transport *transport)
 static int do_fetch(struct transport *transport,
 		    struct refspec *refs, int ref_count)
 {
-	struct ref *ref_map, *fetch_map;
+	struct ref *ref_map;
 	struct ref *rm;
 	int autotags = (transport->remote->fetch_tags == 1);
 	if (transport->remote->fetch_tags == 2 && tags != TAGS_UNSET)
@@ -540,8 +540,7 @@ static int do_fetch(struct transport *transport,
 		free_refs(ref_map);
 		return 1;
 	}
-
-	fetch_map = ref_map;
+	free_refs(ref_map);
 
 	/* if neither --no-tags nor --tags was specified, do automated tag
 	 * following ... */
@@ -554,8 +553,6 @@ static int do_fetch(struct transport *transport,
 		free_refs(ref_map);
 	}
 
-	free_refs(fetch_map);
-
 	transport_disconnect(transport);
 
 	return 0;