Merge branch 'jk/difftool-no-overwrite-on-copyback'

diff --git a/t/t3202-show-branch-octopus.sh b/t/t3202-show-branch-octopus.sh
index 8d50c23b84dad390a66edc1c3e80007ef43fa3a3..0a5d5e669fac2e3be513df4f27c1f0a6560796db 100755 (executable)
--- a/t/t3202-show-branch-octopus.sh
+++ b/t/t3202-show-branch-octopus.sh
@@ -49,11 +49,19 @@ cat > expect << EOF
 +++++++++* [branch10^] initial
 EOF
 
-test_expect_failure 'show-branch with more than 8 branches' '
+test_expect_success 'show-branch with more than 8 branches' '
 
        git show-branch $(for i in $numbers; do echo branch$i; done) > out &&
        test_cmp expect out
 
 '
 
+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