aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-11-18 12:24:49 -0800
committerJunio C Hamano <gitster@pobox.com>2013-11-18 12:24:49 -0800
commitab930f02961bd4cce9b3dd5049c6eabd07ca03a8 (patch)
tree773140cf2f2ebbf83436f0957104a9a248b16854 /t
parent03973056a08d1694cf1c819eb2e8b9557650f70e (diff)
parent6b364d48f2e72d6c37115e6aa4fe769a523dd1d4 (diff)
downloadgit-ab930f02961bd4cce9b3dd5049c6eabd07ca03a8.tar.gz
git-ab930f02961bd4cce9b3dd5049c6eabd07ca03a8.tar.xz
Merge branch 'jx/branch-vv-always-compare-with-upstream'
Hot-fix for a regression. * jx/branch-vv-always-compare-with-upstream: branch: fix --verbose output column alignment
Diffstat (limited to 't')
-rwxr-xr-xt/t6040-tracking-info.sh24
1 files changed, 13 insertions, 11 deletions
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index ba26cfe92..7ac8fd06c 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -39,12 +39,14 @@ test_expect_success setup '
advance h
'
-script='s/^..\(b.\)[ 0-9a-f]*\[\([^]]*\)\].*/\1 \2/p'
+script='s/^..\(b.\) *[0-9a-f]* \(.*\)$/\1 \2/p'
cat >expect <<\EOF
-b1 ahead 1, behind 1
-b2 ahead 1, behind 1
-b3 behind 1
-b4 ahead 2
+b1 [ahead 1, behind 1] d
+b2 [ahead 1, behind 1] d
+b3 [behind 1] b
+b4 [ahead 2] f
+b5 g
+b6 c
EOF
test_expect_success 'branch -v' '
@@ -57,12 +59,12 @@ test_expect_success 'branch -v' '
'
cat >expect <<\EOF
-b1 origin/master: ahead 1, behind 1
-b2 origin/master: ahead 1, behind 1
-b3 origin/master: behind 1
-b4 origin/master: ahead 2
-b5 brokenbase: gone
-b6 origin/master
+b1 [origin/master: ahead 1, behind 1] d
+b2 [origin/master: ahead 1, behind 1] d
+b3 [origin/master: behind 1] b
+b4 [origin/master: ahead 2] f
+b5 [brokenbase: gone] g
+b6 [origin/master] c
EOF
test_expect_success 'branch -vv' '