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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxx>
---
 builtin-remote.c  |    1 +
 t/t5505-remote.sh |    6 ++++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/builtin-remote.c b/builtin-remote.c
index 24e6929..d62130d 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -469,6 +469,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 ecfc999..8a88140 100755
--- 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)
 '
-- 
1.5.5.rc0.11.g12588.dirty

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux