Merge branch 'dt/log-follow-config'

diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index 16efe7af03d210cb349337e978c6105cb22d80e8..9454423ca02af98ad50a089e0c0dc2bc1e952bd0 100755 (executable)
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -156,4 +156,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