summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-03-03 02:35:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-03 08:05:45 (GMT)
commit767f176a1f11e07b9098f5094dbd9f4033e50504 (patch)
tree4c611130c38b7c1cc949f2aff2404e2a1f6b5898
parent49aaddd102aff1f0fc986629f3dc22a872f202ce (diff)
downloadgit-767f176a1f11e07b9098f5094dbd9f4033e50504.zip
git-767f176a1f11e07b9098f5094dbd9f4033e50504.tar.gz
git-767f176a1f11e07b9098f5094dbd9f4033e50504.tar.bz2
Make git-fetch follow tags we already have objects for sooner
If autofollowing of tags is enabled, we see a new tag on the remote that we don't have, and we already have the SHA-1 object that the tag is peeled to, then we can fetch the tag while we are fetching the other objects on the first connection. This is a slight optimization for projects that have a habit of tagging a release commit after most users have already seen and downloaded that commit object through a prior fetch session. In such cases the users may still find new objects in branch heads, but the new tag will now also be part of the first pack transfer and the subsequent connection to autofollow tags is not required. Currently git.git does not benefit from this optimization as any release usually gets a new commit at the same time that it gets a new release tag, however git-gui.git and many other projects are in the habit of tagging fairly old commits. Users who did not already have the tagged commit still require opening a second connection to autofollow the tag, as we are unable to determine on the client side if $tag^{} will be sent to the client during the first transfer or not. Such computation must be performed on the remote side of the connection and is deferred to another series of changes. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-fetch.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/builtin-fetch.c b/builtin-fetch.c
index 3758d48..a58efa6 100644
--- a/builtin-fetch.c
+++ b/builtin-fetch.c
@@ -101,6 +101,10 @@ static void add_merge_config(struct ref **head,
}
}
+static void find_non_local_tags(struct transport *transport,
+ struct ref **head,
+ struct ref ***tail);
+
static struct ref *get_ref_map(struct transport *transport,
struct refspec *refs, int ref_count, int tags,
int *autotags)
@@ -160,6 +164,8 @@ static struct ref *get_ref_map(struct transport *transport,
tail = &ref_map->next;
}
}
+ if (tags == TAGS_DEFAULT && *autotags)
+ find_non_local_tags(transport, &ref_map, &tail);
ref_remove_duplicates(ref_map);
return ref_map;