branch: introduce --list option

diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 6c3719141aa567b97de1228f53a6c49eaf139e8e..4e57dc8cdc423e6c478371d94a304f5bd82e1f41 100755 (executable)
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -42,13 +42,29 @@ b3 behind 1
 b4 ahead 2
 EOF
 
-test_expect_success C_LOCALE_OUTPUT 'branch -v' '
+test_expect_success 'branch -v' '
        (
                cd test &&
                git branch -v
        ) |
        sed -n -e "$script" >actual &&
-       test_cmp expect actual
+       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' '