Merge branch 'bl/gitweb-project-filter'

[git.git] / builtin / clone.c

diff --git a/builtin/clone.c b/builtin/clone.c
index 651b4cc20bd932876e35dd16f6ac2a7ecfc9b501..c62d4b5737ed41f3c7a2d9cbec3b77651236a467 100644 (file)
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -472,11 +472,10 @@ static void write_remote_refs(const struct ref *local_refs)
        for (r = local_refs; r; r = r->next) {
                if (!r->peer_ref)
                        continue;
-               add_extra_ref(r->peer_ref->name, r->old_sha1, 0);
+               add_packed_ref(r->peer_ref->name, r->old_sha1);
        }
 
        pack_refs(PACK_REFS_ALL);
-       clear_extra_refs();
 }
 
 static void write_followtags(const struct ref *refs, const char *msg)
@@ -563,7 +562,10 @@ static int checkout(void)
                          "unable to checkout.\n"));
                return 0;
        }
-       if (strcmp(head, "HEAD")) {
+       if (!strcmp(head, "HEAD")) {
+               if (advice_detached_head)
+                       detach_advice(sha1_to_hex(sha1));
+       } else {
                if (prefixcmp(head, "refs/heads/"))
                        die(_("HEAD not found below refs/heads!"));
        }
@@ -628,12 +630,13 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
        const struct ref *remote_head_points_at;
        const struct ref *our_head_points_at;
        struct ref *mapped_refs;
+       const struct ref *ref;
        struct strbuf key = STRBUF_INIT, value = STRBUF_INIT;
        struct strbuf branch_top = STRBUF_INIT, reflog_msg = STRBUF_INIT;
        struct transport *transport = NULL;
        const char *src_ref_prefix = "refs/heads/";
        struct remote *remote;
-       int err = 0;
+       int err = 0, complete_refs_before_fetch = 1;
 
        struct refspec *refspec;
        const char *fetch_pattern;
@@ -813,15 +816,22 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
        mapped_refs = refs ? wanted_peer_refs(refs, refspec) : NULL;
 
        /*
-        * mapped_refs may be updated if transport-helper is used so
-        * we need fetch it early because remote_head code below
-        * relies on it.
+        * transport_get_remote_refs() may return refs with null sha-1
+        * in mapped_refs (see struct transport->get_refs_list
+        * comment). In that case we need fetch it early because
+        * remote_head code below relies on it.
         *
         * for normal clones, transport_get_remote_refs() should
         * return reliable ref set, we can delay cloning until after
         * remote HEAD check.
         */
-       if (!is_local && remote->foreign_vcs && refs)
+       for (ref = refs; ref; ref = ref->next)
+               if (is_null_sha1(ref->old_sha1)) {
+                       complete_refs_before_fetch = 0;
+                       break;
+               }
+
+       if (!is_local && !complete_refs_before_fetch && refs)
                transport_fetch_refs(transport, mapped_refs);
 
        if (refs) {
@@ -853,7 +863,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 
        if (is_local)
                clone_local(path, git_dir);
-       else if (refs && !remote->foreign_vcs)
+       else if (refs && complete_refs_before_fetch)
                transport_fetch_refs(transport, mapped_refs);
 
        update_remote_refs(refs, mapped_refs, remote_head_points_at,