Merge branch 'maint'

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 36f7749bed8a40f50f218bbd6c4dcf7763c5abee..c3de151942effc8ca1c9927a356b1b1b91bb0aeb 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -16,8 +16,8 @@ test_expect_success \
      git-update-index --add A &&
      git-commit -m "Initial commit."'
 
-test_expect_failure \
-    'git branch --help should return error code' \
+test_expect_success \
+    'git branch --help should return success now.' \
     'git-branch --help'
 
 test_expect_failure \