Merge branch 'jc/am-i-v-fix' into maint

diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index 16efe7af03d210cb349337e978c6105cb22d80e8..4261403cf62542e82d40487e47733f586e106a75 100755 (executable)
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -156,4 +156,32 @@ EOF
        test_i18ncmp expect actual
 '
 
+test_expect_success 'git branch `--sort` option' '
+       cat >expect <<-\EOF &&
+       * (HEAD detached from fromtag)
+         branch-two
+         branch-one
+         master
+       EOF
+       git branch --sort=objectsize >actual &&
+       test_i18ncmp expect actual
+'
+
+test_expect_success 'git branch --points-at option' '
+       cat >expect <<-\EOF &&
+         branch-one
+         master
+       EOF
+       git branch --points-at=branch-one >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success 'ambiguous branch/tag not marked' '
+       git tag ambiguous &&
+       git branch ambiguous &&
+       echo "  ambiguous" >expect &&
+       git branch --list ambiguous >actual &&
+       test_cmp expect actual
+'
+
 test_done