[PATCH 04/13] remote: make get_remote_ref_states() always populate states.tracked
From: Jay Soffian <hidden>
Date: 2016-06-15 22:46:16
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 the other call sites. Signed-off-by: Jay Soffian <redacted> --- builtin-remote.c | 41 ++++++++++++++++++++--------------------- 1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/builtin-remote.c b/builtin-remote.c
index 31fbd1e..b61f754 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c@@ -656,6 +656,23 @@ static void free_remote_ref_states(struct ref_states *states) string_list_clear(&states->heads, 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; + + if (flags & REF_ISSYMREF) + return 0; + + 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, struct ref_states *states, int query)
@@ -677,28 +694,14 @@ static int get_remote_ref_states(const char *name, get_head_names(ref, name, states); get_ref_states(ref, states); + } else { + for_each_ref(append_ref_to_tracked_list, states); + sort_string_list(&states->tracked); } 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; - - if (flags & REF_ISSYMREF) - return 0; - - 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 show(int argc, const char **argv) { int no_query = 0, result = 0;
@@ -757,10 +760,6 @@ static int show(int argc, const char **argv) "prune')", &states.stale, ""); } - if (no_query) { - for_each_ref(append_ref_to_tracked_list, &states); - sort_string_list(&states.tracked); - } show_list(" Tracked remote branch%s", &states.tracked, ""); if (states.remote->push_refspec_nr) {
--
1.6.2.rc1.223.gfed32