mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Michael Haggerty
2012-02-11 07:20:56 +01:00
committed by Junio C Hamano
parent acede2ebc9
commit 5b05795c4c
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/clone.c
View File

@ -813,8 +813,9 @@ 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) {
mapped_refs = wanted_peer_refs(refs, refspec);
/* /*
* transport_get_remote_refs() may return refs with null sha-1 * transport_get_remote_refs() may return refs with null sha-1
* in mapped_refs (see struct transport->get_refs_list * in mapped_refs (see struct transport->get_refs_list
@ -831,10 +832,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
break; 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;