@matheusbsbs / matheus-bagliano / commits / 9049816140

clone: fix up delay cloning conditions

6f48d39 (clone: delay cloning until after remote HEAD checking - 2012-01-16) allows us to perform some checks on remote refs before the actual cloning happens. But not all transport types support this. Remote helper with "import" capability will not return complete ref information until fetch is performed and therefore the clone cannot be delayed. foreign_vcs field in struct remote was used to detect this kind of transport and save the result. This is a mistake because foreign_vcs is designed to override url-based transport detection. As a result, if the same "struct transport *" object is used on many different urls and one of them attached remote transport, the following urls will be mistakenly attached to the same transport. This fault is worked around by dad0b3d (push: do not let configured foreign-vcs permanently clobbered - 2012-01-23) To fix this, detect incomplete refs from transport_get_remote_refs() by SHA-1. Incomplete ones must have null SHA-1 (*). Then revert changes related to foreign_cvs field in 6f48d39 and dad0b3d. A good thing from this change is that cloning smart http transport can also be delayed. Earlier it falls into the same category "remote transport, no delay". (*) Theoretically if one of the remote refs happens to have null SHA-1, it will trigger false alarm and the clone will not be delayed. But that chance may be too small for us to pay attention to. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nguyễn Thái Ngọc Duy committed Jan 24, 2012 at 18:10 UTC 9049816140e75d3f7b15264e97e042f5ab0bf392
3 files changed +15 -12
builtin/clone.c
+14 -6
@@ -631,12 +631,13 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
631 const struct ref *remote_head_points_at;
632 const struct ref *our_head_points_at;
633 struct ref *mapped_refs;
634 + const struct ref *ref;
635 struct strbuf key = STRBUF_INIT, value = STRBUF_INIT;
636 struct strbuf branch_top = STRBUF_INIT, reflog_msg = STRBUF_INIT;
637 struct transport *transport = NULL;
638 const char *src_ref_prefix = "refs/heads/";
639 struct remote *remote;
639 - int err = 0;
640 + int err = 0, complete_refs_before_fetch = 1;
641
642 struct refspec *refspec;
643 const char *fetch_pattern;
@@ -816,15 +817,22 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
817 mapped_refs = refs ? wanted_peer_refs(refs, refspec) : NULL;
818
819 /*
819 - * mapped_refs may be updated if transport-helper is used so
820 - * we need fetch it early because remote_head code below
821 - * relies on it.
820 + * transport_get_remote_refs() may return refs with null sha-1
821 + * in mapped_refs (see struct transport->get_refs_list
822 + * comment). In that case we need fetch it early because
823 + * remote_head code below relies on it.
824 *
825 * for normal clones, transport_get_remote_refs() should
826 * return reliable ref set, we can delay cloning until after
827 * remote HEAD check.
828 */
827 - if (!is_local && remote->foreign_vcs && refs)
829 + for (ref = refs; ref; ref = ref->next)
830 + if (is_null_sha1(ref->old_sha1)) {
831 + complete_refs_before_fetch = 0;
832 + break;
833 + }
834 +
835 + if (!is_local && !complete_refs_before_fetch && refs)
836 transport_fetch_refs(transport, mapped_refs);
837
838 if (refs) {
@@ -856,7 +864,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
864
865 if (is_local)
866 clone_local(path, git_dir);
859 - else if (refs && !remote->foreign_vcs)
867 + else if (refs && complete_refs_before_fetch)
868 transport_fetch_refs(transport, mapped_refs);
869
870 update_remote_refs(refs, mapped_refs, remote_head_points_at,
builtin/push.c
-2
@@ -204,13 +204,11 @@ static int do_push(const char *repo, int flags)
204 url_nr = remote->url_nr;
205 }
206 if (url_nr) {
207 - const char *configured_foreign_vcs = remote->foreign_vcs;
207 for (i = 0; i < url_nr; i++) {
208 struct transport *transport =
209 transport_get(remote, url[i]);
210 if (push_with_options(transport, flags))
211 errs++;
213 - remote->foreign_vcs = configured_foreign_vcs;
212 }
213 } else {
214 struct transport *transport =
transport.c
+1 -4
@@ -895,10 +895,8 @@ struct transport *transport_get(struct remote *remote, const char *url)
895
896 while (is_urlschemechar(p == url, *p))
897 p++;
898 - if (!prefixcmp(p, "::")) {
898 + if (!prefixcmp(p, "::"))
899 helper = xstrndup(url, p - url);
900 - remote->foreign_vcs = helper;
901 - }
900 }
901
902 if (helper) {
@@ -940,7 +938,6 @@ struct transport *transport_get(struct remote *remote, const char *url)
938 char *handler = xmalloc(len + 1);
939 handler[len] = 0;
940 strncpy(handler, url, len);
943 - remote->foreign_vcs = handler;
941 transport_helper_init(ret, handler);
942 }
943