Merge branch 'dz/apply-again'

[git.git] / builtin-remote.c

diff --git a/builtin-remote.c b/builtin-remote.c
index 6bce55cd53c062bebcee3d085f1ae74eae9c299e..145dd8568c7a644344d8bb25ba395b10c5835c5c 100644 (file)
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -444,6 +444,22 @@ static int get_remote_ref_states(const char *name,
        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)) {
+               path_list_append(skip_prefix(refspec.src, "refs/heads/"),
+                       &states->tracked);
+       }
+
+       return 0;
+}
+
 static int show(int argc, const char **argv)
 {
        int no_query = 0, result = 0;
@@ -494,10 +510,12 @@ static int show(int argc, const char **argv)
                        strbuf_release(&buf);
                        show_list("  Stale tracking branch%s (use 'git remote "
                                "prune')", &states.stale);
-                       show_list("  Tracked remote branch%s",
-                               &states.tracked);
                }
 
+               if (no_query)
+                       for_each_ref(append_ref_to_tracked_list, &states);
+               show_list("  Tracked remote branch%s", &states.tracked);
+
                if (states.remote->push_refspec_nr) {
                        printf("  Local branch%s pushed with 'git push'\n   ",
                                states.remote->push_refspec_nr > 1 ?
@@ -542,12 +560,13 @@ static int prune(int argc, const char **argv)
 
                get_remote_ref_states(*argv, &states, 1);
 
-               printf("Pruning %s\n", *argv);
-               if (states.stale.nr)
+               if (states.stale.nr) {
+                       printf("Pruning %s\n", *argv);
                        printf("URL: %s\n",
                               states.remote->url_nr
                               ? states.remote->url[0]
                               : "(no URL)");
+               }
 
                for (i = 0; i < states.stale.nr; i++) {
                        const char *refname = states.stale.items[i].util;