Merge branch 'sa/send-email-smtp-batch-data-limit'

diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index f51d0f3cadcb4f97f4cf9f2d79aad9ed401781d8..f1ae5ff662efa3941748f29a7958f23d9519dda1 100755 (executable)
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -143,4 +143,24 @@ EOF
        test_i18ncmp expect actual
 '
 
+test_expect_success 'git branch `--sort` option' '
+       cat >expect <<-\EOF &&
+         branch-two
+       * (HEAD detached from fromtag)
+         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_done