Browse Source

clone.c: move more code into the "if (refs)" conditional

The bahavior of a bunch of code before the "if (refs)" statement also
depends on whether refs is set, so make the logic clearer by shifting
this code into the if statement.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael Haggerty 13 years ago committed by Junio C Hamano
parent
commit
5b05795c4c
  1. 39
      builtin/clone.c

39
builtin/clone.c

@ -813,28 +813,28 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
} }


refs = transport_get_remote_refs(transport); refs = transport_get_remote_refs(transport);
mapped_refs = refs ? wanted_peer_refs(refs, refspec) : NULL;


/* if (refs) {
* transport_get_remote_refs() may return refs with null sha-1 mapped_refs = wanted_peer_refs(refs, refspec);
* in mapped_refs (see struct transport->get_refs_list /*
* comment). In that case we need fetch it early because * transport_get_remote_refs() may return refs with null sha-1
* remote_head code below relies on it. * in mapped_refs (see struct transport->get_refs_list
* * comment). In that case we need fetch it early because
* for normal clones, transport_get_remote_refs() should * remote_head code below relies on it.
* return reliable ref set, we can delay cloning until after *
* remote HEAD check. * for normal clones, transport_get_remote_refs() should
*/ * return reliable ref set, we can delay cloning until after
for (ref = refs; ref; ref = ref->next) * remote HEAD check.
if (is_null_sha1(ref->old_sha1)) { */
complete_refs_before_fetch = 0; for (ref = refs; ref; ref = ref->next)
break; if (is_null_sha1(ref->old_sha1)) {
} complete_refs_before_fetch = 0;
break;
}


if (!is_local && !complete_refs_before_fetch && refs) if (!is_local && !complete_refs_before_fetch)
transport_fetch_refs(transport, mapped_refs); transport_fetch_refs(transport, mapped_refs);


if (refs) {
remote_head = find_ref_by_name(refs, "HEAD"); remote_head = find_ref_by_name(refs, "HEAD");
remote_head_points_at = remote_head_points_at =
guess_remote_head(remote_head, mapped_refs, 0); guess_remote_head(remote_head, mapped_refs, 0);
@ -852,6 +852,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
} }
else { else {
warning(_("You appear to have cloned an empty repository.")); warning(_("You appear to have cloned an empty repository."));
mapped_refs = NULL;
our_head_points_at = NULL; our_head_points_at = NULL;
remote_head_points_at = NULL; remote_head_points_at = NULL;
remote_head = NULL; remote_head = NULL;

Loading…
Cancel
Save