use struct sha1_array in diff_tree_combined()

diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 19de5b16eb530d428f66e5161a3ab48fce34049d..19272bc551277903bc1c444f4f0f05d8f2d7d672 100755 (executable)
--- 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