diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-10-04 14:48:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-04 14:48:44 -0700 |
| commit | 04ce83e2b9a1f1512d3d0c873e8f13d06761620c (patch) | |
| tree | 2ac6b140088072d7b01f44b86a36490f2dc318e0 /t/t3202-show-branch-octopus.sh | |
| parent | bb8cccd01762d26c832b85d3b09798650e294c5f (diff) | |
| parent | 3af1cae469555485cd3ef003aa2a55bd2a4f544f (diff) | |
| download | git-04ce83e2b9a1f1512d3d0c873e8f13d06761620c.tar.gz git-04ce83e2b9a1f1512d3d0c873e8f13d06761620c.tar.xz | |
Merge branch 'jc/maint-1.6.4-show-branch-default' into maint
* jc/maint-1.6.4-show-branch-default:
show-branch: fix segfault when showbranch.default exists
Diffstat (limited to 't/t3202-show-branch-octopus.sh')
| -rwxr-xr-x | t/t3202-show-branch-octopus.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3202-show-branch-octopus.sh b/t/t3202-show-branch-octopus.sh index 7fe4a6ecb..0a5d5e669 100755 --- a/t/t3202-show-branch-octopus.sh +++ b/t/t3202-show-branch-octopus.sh @@ -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 |