Merge branch 'pt/pull-tests' into pt/pull-optparse

diff --git a/t/t3202-show-branch-octopus.sh b/t/t3202-show-branch-octopus.sh
index 7fe4a6ecb05df0fbfb825fbb08207f7672e1775f..6adf47869c468a98ce41bc3dd1396b81dc50af3f 100755 (executable)
--- a/t/t3202-show-branch-octopus.sh
+++ b/t/t3202-show-branch-octopus.sh
@@ -19,7 +19,7 @@ test_expect_success 'setup' '
                > file$i &&
                git add file$i &&
                test_tick &&
-               git commit -m branch$i || break
+               git commit -m branch$i || return 1
        done
 
 '
@@ -56,4 +56,12 @@ test_expect_success 'show-branch with more than 8 branches' '
 
 '
 
+test_expect_success 'show-branch with showbranch.default' '
+       for i in $numbers; do
+               git config --add showbranch.default branch$i
+       done &&
+       git show-branch >out &&
+       test_cmp expect out
+'
+
 test_done