git-remote: list branches in vertical lists

Previously, branches were listed on a single line in each section. But
if there are many branches, then horizontal, line-wrapped lists are very
inconvenient to scan for a human. This makes the lists vertical, i.e one
branch per line is printed.

Since "git remote" is porcelain, we can easily make this
backwards-incompatible change.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 08d1310bf5fc5590ada1ee5b2af77d361ff4d874..645d752c5c26d8724e8ded0abe1f207bf3ff6854 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -4356,7 +4356,9 @@ $ git remote show example # get details
 * remote example
   URL: git://example.com/project.git
   Tracked remote branches
 * remote example
   URL: git://example.com/project.git
   Tracked remote branches

-    master next ...
+    master
+    next
+    ...

 $ git fetch example            # update branches from example
 $ git branch -r                        # list all remote branches
 -----------------------------------------------
 $ git fetch example            # update branches from example
 $ git branch -r                        # list all remote branches
 -----------------------------------------------

diff --git a/builtin-remote.c b/builtin-remote.c
index 6b3325dfa9e0aa52d806d1c28692a05cf549abe4..df2be068b69b6d926d4980e6e9eada05d92643e1 100644 (file)
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -412,10 +412,9 @@ static void show_list(const char *title, struct string_list *list,
                return;
 
        printf(title, list->nr > 1 ? "es" : "", extra_arg);
                return;
 
        printf(title, list->nr > 1 ? "es" : "", extra_arg);

-       printf("\n    ");
-       for (i = 0; i < list->nr; i++)
-               printf("%s%s", i ? " " : "", list->items[i].string);

        printf("\n");
        printf("\n");

+       for (i = 0; i < list->nr; i++)
+               printf("    %s\n", list->items[i].string);

 }
 
 static int get_remote_ref_states(const char *name,
 }
 
 static int get_remote_ref_states(const char *name,


@@ -511,17 +510,17 @@ static int show(int argc, const char **argv)
                show_list("  Tracked remote branch%s", &states.tracked, "");
 
                if (states.remote->push_refspec_nr) {
                show_list("  Tracked remote branch%s", &states.tracked, "");
 
                if (states.remote->push_refspec_nr) {

-                       printf("  Local branch%s pushed with 'git push'\n   ",
+                       printf("  Local branch%s pushed with 'git push'\n",

                                states.remote->push_refspec_nr > 1 ?
                                        "es" : "");
                        for (i = 0; i < states.remote->push_refspec_nr; i++) {
                                struct refspec *spec = states.remote->push + i;
                                states.remote->push_refspec_nr > 1 ?
                                        "es" : "");
                        for (i = 0; i < states.remote->push_refspec_nr; i++) {
                                struct refspec *spec = states.remote->push + i;

-                               printf(" %s%s%s%s", spec->force ? "+" : "",
+                               printf("    %s%s%s%s\n",
+                                      spec->force ? "+" : "",

                                       abbrev_branch(spec->src),
                                       spec->dst ? ":" : "",
                                       spec->dst ? abbrev_branch(spec->dst) : "");
                        }
                                       abbrev_branch(spec->src),
                                       spec->dst ? ":" : "",
                                       spec->dst ? abbrev_branch(spec->dst) : "");
                        }

-                       printf("\n");

                }
 
                /* NEEDSWORK: free remote */
                }
 
                /* NEEDSWORK: free remote */

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 0103e1a18046b6a156721da0036155b2f707b9f6..c4380c7e3232f2ccffab4b84358a4f376533249b 100755 (executable)
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -28,7 +28,7 @@ tokens_match () {
 }
 
 check_remote_track () {
 }
 
 check_remote_track () {

-       actual=$(git remote show "$1" | sed -n -e '$p') &&
+       actual=$(git remote show "$1" | sed -e '1,/Tracked/d') &&

        shift &&
        tokens_match "$*" "$actual"
 }
        shift &&
        tokens_match "$*" "$actual"
 }


@@ -115,9 +115,11 @@ cat > test/expect << EOF
   New remote branch (next fetch will store in remotes/origin)
     master
   Tracked remote branches
   New remote branch (next fetch will store in remotes/origin)
     master
   Tracked remote branches

-    side master
+    side
+    master

   Local branches pushed with 'git push'
   Local branches pushed with 'git push'

-    master:upstream +refs/tags/lastbackup
+    master:upstream
+    +refs/tags/lastbackup

 EOF
 
 test_expect_success 'show' '
 EOF
 
 test_expect_success 'show' '


@@ -144,9 +146,11 @@ cat > test/expect << EOF
   Remote branch merged with 'git pull' while on branch master
     master
   Tracked remote branches
   Remote branch merged with 'git pull' while on branch master
     master
   Tracked remote branches

-    master side
+    master
+    side

   Local branches pushed with 'git push'
   Local branches pushed with 'git push'

-    master:upstream +refs/tags/lastbackup
+    master:upstream
+    +refs/tags/lastbackup

 EOF
 
 test_expect_success 'show -n' '
 EOF
 
 test_expect_success 'show -n' '