builtin-remote: Fix missing newline at end of listing of pushed branches

Without this the output of 'git remote show' does not end with a new-line:

bash> git remote show repo
* remote repo
  URL: repo.or.cz:/srv/git/kdbg.git
  Tracked remote branches
    maint master mob
  Local branch pushed with 'git push'
    +master:masterbash>

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-remote.c b/builtin-remote.c
index 9c15173032f8566539a10b93074e15d493dd17d7..d77f10a0eaa64466b919bcede37ad8c67b70b3fc 100644 (file)
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -472,6 +472,7 @@ static int show_or_prune(int argc, const char **argv, int prune)
                                        spec->dst ? ":" : "",
                                        skip_prefix(spec->dst, "refs/heads/"));
                        }
+                       printf("\n");
                }
 cleanup_states:
                /* NEEDSWORK: free remote */

diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 004a8dc5ed28f57de76935c4f02803fe6496d4d6..0a7fea865d2be6e1a74e2016f336af22956de414 100755 (executable)
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -106,6 +106,8 @@ cat > test/expect << EOF
     master
   Tracked remote branches
     side master
+  Local branches pushed with 'git push'
+    master:upstream +refs/tags/lastbackup
 EOF
 
 test_expect_success 'show' '
@@ -118,6 +120,10 @@ test_expect_success 'show' '
          echo 1 > file &&
          test_tick &&
          git commit -m update file) &&
+        git config remote.origin.push \
+               refs/heads/master:refs/heads/upstream &&
+        git config --add remote.origin.push \
+               +refs/tags/lastbackup &&
         git remote show origin > output &&
         git diff expect output)
 '