From ec31b0ce983e7e96b8a419dec3c34907b2f8226e Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Tue, 18 Mar 2008 21:52:00 +0100 Subject: [PATCH] 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 Acked-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- builtin-remote.c | 1 + t/t5505-remote.sh | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/builtin-remote.c b/builtin-remote.c index 9c1517303..d77f10a0e 100644 --- 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 004a8dc5e..0a7fea865 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) '