summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2011-08-26 14:05:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-08-26 17:45:04 (GMT)
commitafc1692fefe0dc357d9ff5353ab77d14b26d7ab9 (patch)
tree9d9f99d0830ba04a67e313c4d42fc89b19b8c04c
parentb792c067872a6b4ec6545dc4375a7084626cb0fa (diff)
downloadgit-afc1692fefe0dc357d9ff5353ab77d14b26d7ab9.zip
git-afc1692fefe0dc357d9ff5353ab77d14b26d7ab9.tar.gz
git-afc1692fefe0dc357d9ff5353ab77d14b26d7ab9.tar.bz2
t6040: test branch -vv
t6040 has a test for 'git branch -v' but not for 'git branch -vv'. Add one. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t6040-tracking-info.sh16
1 files changed, 16 insertions, 0 deletions
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index a9b0ac1..4e57dc8 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -51,6 +51,22 @@ test_expect_success 'branch -v' '
test_i18ncmp expect actual
'
+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
+EOF
+
+test_expect_success 'branch -vv' '
+ (
+ cd test &&
+ git branch -vv
+ ) |
+ sed -n -e "$script" >actual &&
+ test_i18ncmp expect actual
+'
+
test_expect_success 'checkout' '
(
cd test && git checkout b1