aboutsummaryrefslogtreecommitdiff
path: root/t/t5505-remote.sh
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2008-10-22 09:39:47 +0200
committerJunio C Hamano <gitster@pobox.com>2008-10-22 18:05:38 -0700
commit20244ea2d09a3f5c3c83133014ca1e1b7b3d0227 (patch)
tree58d3ac35a6449f02769956d407542c73579495cc /t/t5505-remote.sh
parentf55527f80223178d1837bae08addc57bed76d236 (diff)
downloadgit-20244ea2d09a3f5c3c83133014ca1e1b7b3d0227.tar.gz
git-20244ea2d09a3f5c3c83133014ca1e1b7b3d0227.tar.xz
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>
Diffstat (limited to 't/t5505-remote.sh')
-rwxr-xr-xt/t5505-remote.sh14
1 files changed, 9 insertions, 5 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 0103e1a18..c4380c7e3 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -28,7 +28,7 @@ tokens_match () {
}
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"
}
@@ -115,9 +115,11 @@ cat > test/expect << EOF
New remote branch (next fetch will store in remotes/origin)
master
Tracked remote branches
- side master
+ side
+ master
Local branches pushed with 'git push'
- master:upstream +refs/tags/lastbackup
+ master:upstream
+ +refs/tags/lastbackup
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
- master side
+ master
+ side
Local branches pushed with 'git push'
- master:upstream +refs/tags/lastbackup
+ master:upstream
+ +refs/tags/lastbackup
EOF
test_expect_success 'show -n' '