summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-10-04 14:48:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-10-04 14:48:51 -0700
commita7aebb9d00332364411e85c703cc25dc0580f2d4 (patch)
treec1930a07e087ae511025391a012a734c98a4b8a6 /t
parentFix '--relative-date' (diff)
parentMerge branch 'jc/maint-1.6.4-show-branch-default' into maint (diff)
downloadtgif-a7aebb9d00332364411e85c703cc25dc0580f2d4.tar.xz
Merge branch 'maint'
* maint: show-branch: fix segfault when showbranch.default exists
Diffstat (limited to 't')
-rwxr-xr-xt/t3202-show-branch-octopus.sh8
1 files changed, 8 insertions, 0 deletions
diff --git a/t/t3202-show-branch-octopus.sh b/t/t3202-show-branch-octopus.sh
index 7fe4a6ecb0..0a5d5e669f 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