undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin-remote: make get_remote_ref_states() always populate states.tracked

Browse Source 
When not querying the remote, show() was having to populate
states.tracked itself. It makes more sense for get_remote_ref_states()
to do this consistently. Since show() is the only caller of
get_remote_ref_states() with query=0, this change does not affect
other callers.

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jay Soffian 2009-02-25 03:32:22 -05:00 committed by Junio C Hamano
parent e0cc81e63c
commit cca7c97e37
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
builtin-remote.c
View File

@ -632,6 +632,20 @@ static void free_remote_ref_states(struct ref_states *states)
string_list_clear(&states->tracked, 0); string_list_clear(&states->tracked, 0);
} }
static int append_ref_to_tracked_list(const char *refname,
const unsigned char *sha1, int flags, void *cb_data)
{
struct ref_states *states = cb_data;
struct refspec refspec;
memset(&refspec, 0, sizeof(refspec));
refspec.dst = (char *)refname;
if (!remote_find_tracking(states->remote, &refspec))
string_list_append(abbrev_branch(refspec.src), &states->tracked);
return 0;
}
static int get_remote_ref_states(const char *name, static int get_remote_ref_states(const char *name,
struct ref_states *states, struct ref_states *states,
int query) int query)
@ -652,21 +666,8 @@ static int get_remote_ref_states(const char *name,
transport_disconnect(transport); transport_disconnect(transport);
get_ref_states(remote_refs, states); get_ref_states(remote_refs, states);
} } else
for_each_ref(append_ref_to_tracked_list, states);
return 0;
}
static int append_ref_to_tracked_list(const char *refname,
const unsigned char *sha1, int flags, void *cb_data)
{
struct ref_states *states = cb_data;
struct refspec refspec;
memset(&refspec, 0, sizeof(refspec));
refspec.dst = (char *)refname;
if (!remote_find_tracking(states->remote, &refspec))
string_list_append(abbrev_branch(refspec.src), &states->tracked);
return 0; return 0;
} }
@ -720,8 +721,6 @@ static int show(int argc, const char **argv)
"prune')", &states.stale, ""); "prune')", &states.stale, "");
} }
if (no_query)
for_each_ref(append_ref_to_tracked_list, &states);
show_list(" Tracked remote branch%s", &states.tracked, ""); show_list(" Tracked remote branch%s", &states.tracked, "");
if (states.remote->push_refspec_nr) { if (states.remote->push_refspec_nr) {