* [PATCH] builtin-remote: Fix missing newline at end of listing of pushed branches
@ 2008-03-18 20:52 Johannes Sixt
2008-03-19 20:43 ` Johannes Schindelin
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Sixt @ 2008-03-18 20:52 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
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>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] builtin-remote: Fix missing newline at end of listing of pushed branches
2008-03-18 20:52 [PATCH] builtin-remote: Fix missing newline at end of listing of pushed branches Johannes Sixt
@ 2008-03-19 20:43 ` Johannes Schindelin
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Schindelin @ 2008-03-19 20:43 UTC (permalink / raw)
To: Johannes Sixt; +Cc: Junio C Hamano, git
Hi,
On Tue, 18 Mar 2008, Johannes Sixt wrote:
> 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>
Obviously Acked-by: me.
Sorry & Thanks,
Dscho
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-03-19 20:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-18 20:52 [PATCH] builtin-remote: Fix missing newline at end of listing of pushed branches Johannes Sixt
2008-03-19 20:43 ` Johannes Schindelin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox