Merge branch 'bc/maint-apply-check-no-patch'

diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index 809d1c4ed49f06d06ba50cda6f52fe9201d2d625..76fe7e0060c20507cb6eb317451b69a2a0c9146d 100755 (executable)
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -12,13 +12,13 @@ test_expect_success 'make commits' '
 '
 
 test_expect_success 'make branches' '
-       git branch branch-one
+       git branch branch-one &&
        git branch branch-two HEAD^
 '
 
 test_expect_success 'make remote branches' '
-       git update-ref refs/remotes/origin/branch-one branch-one
-       git update-ref refs/remotes/origin/branch-two branch-two
+       git update-ref refs/remotes/origin/branch-one branch-one &&
+       git update-ref refs/remotes/origin/branch-two branch-two &&
        git symbolic-ref refs/remotes/origin/HEAD refs/remotes/origin/branch-one
 '
 
@@ -32,6 +32,20 @@ test_expect_success 'git branch shows local branches' '
        test_cmp expect actual
 '
 
+test_expect_success 'git branch --list shows local branches' '
+       git branch --list >actual &&
+       test_cmp expect actual
+'
+
+cat >expect <<'EOF'
+  branch-one
+  branch-two
+EOF
+test_expect_success 'git branch --list pattern shows matching local branches' '
+       git branch --list branch* >actual &&
+       test_cmp expect actual
+'
+
 cat >expect <<'EOF'
   origin/HEAD -> origin/branch-one
   origin/branch-one
@@ -66,6 +80,20 @@ test_expect_success 'git branch -v shows branch summaries' '
        test_cmp expect actual
 '
 
+cat >expect <<'EOF'
+two
+one
+EOF
+test_expect_success 'git branch --list -v pattern shows branch summaries' '
+       git branch --list -v branch* >tmp &&
+       awk "{print \$NF}" <tmp >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success 'git branch -v pattern does not show branch summaries' '
+       test_must_fail git branch -v branch*
+'
+
 cat >expect <<'EOF'
 * (no branch)
   branch-one
@@ -75,7 +103,7 @@ EOF
 test_expect_success 'git branch shows detached HEAD properly' '
        git checkout HEAD^0 &&
        git branch >actual &&
-       test_cmp expect actual
+       test_i18ncmp expect actual
 '
 
 test_done