[PATCH 4/4] Teach git-fetch to grab a tag at the same time as a commit
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- Feb 28, 2008, 08:43 UTC
- Message-ID
- <20080228084305.GD16870@spearce.org>
If the situation is the following on the remote and L is the common base between both sides:
T - tag1 S - tag2
/ /
L - A - O - O - B
\ \
origin/master masterand we have decided to fetch "master" to acquire the range L..B we can also nab tag S at the same time during the first connection, as we can clearly see from the refs advertised by upload-pack that S^{} = B and master = B.
Unfortunately we still cannot nab T at the same time as we are not able to see that T^{} will also be in the range implied by L..B. Such computations must be performed on the remote side (not yet supported) or on the client side as post-processing (the current behavior).
This optimization is an extension of the previous one in that it helps on projects which tend to publish both a new commit and a new tag, then lay idle for a while before publishing anything else. Most followers are able to download both the new commit and the new tag in one connection, rather than two. git.git tends to follow such patterns with its roughly once-daily updates from Junio.
A protocol extension and additional server side logic would be necessary to also ensure T is grabbed on the first connection.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org> --- builtin-fetch.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/builtin-fetch.c b/builtin-fetch.c index a80f95b..eddf788 100644 --- a/builtin-fetch.c +++ b/builtin-fetch.c @@ -458,6 +458,17 @@ static int add_existing(const char *refname, const unsigned char *sha1, return 0; } +static int will_fetch(struct ref **head, const unsigned char *sha1) +{ + struct ref *rm = *head; + while (rm) { + if (!hashcmp(rm->old_sha1, sha1)) + return 1; + rm = rm->next; + } + return 0; +} + static void find_non_local_tags(struct transport *transport, struct ref **head, struct ref ***tail) @@ -494,7 +505,8 @@ static void find_non_local_tags(struct transport *transport, if (!path_list_has_path(&existing_refs, ref_name) && !path_list_has_path(&new_refs, ref_name) && - has_sha1_file(ref->old_sha1)) { + (has_sha1_file(ref->old_sha1) || + will_fetch(head, ref->old_sha1))) { path_list_insert(ref_name, &new_refs); rm = alloc_ref(strlen(ref_name) + 1);
-- 1.5.4.3.393.g5540