summaryrefslogtreecommitdiff
path: root/t/t6009-rev-list-parent.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-03-24 08:21:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-24 18:40:50 (GMT)
commit482ce70e14fdd5d03304a92f1740e6a9022e7958 (patch)
treee49805608794d2f4e8276b0bb2151b528cf2d892 /t/t6009-rev-list-parent.sh
parent6a6ebded7f2288d098f825f97cb2c210f0344497 (diff)
downloadgit-482ce70e14fdd5d03304a92f1740e6a9022e7958.zip
git-482ce70e14fdd5d03304a92f1740e6a9022e7958.tar.gz
git-482ce70e14fdd5d03304a92f1740e6a9022e7958.tar.bz2
tests: avoid nonportable {foo,bar} glob
Unlike bash and ksh, dash and busybox ash do not support brace expansion (as in 'echo {hello,world}'). So when dash is sh, t6009.13 (set up dodecapus) ends up pass a string beginning with "root{1,2," to "git merge" verbatim and the test fails. Fix it by introducing a variable to hold the list of parents for the dodecapus and populating it in a more low-tech way. While at it, simplify a little by combining this setup code with the test it sets up for. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6009-rev-list-parent.sh')
-rwxr-xr-xt/t6009-rev-list-parent.sh16
1 files changed, 8 insertions, 8 deletions
diff --git a/t/t6009-rev-list-parent.sh b/t/t6009-rev-list-parent.sh
index fc89d6d..3050740 100755
--- a/t/t6009-rev-list-parent.sh
+++ b/t/t6009-rev-list-parent.sh
@@ -112,20 +112,20 @@ test_expect_success 'rev-list override and infinities' '
check_revlist "--max-parents=0 --min-parents=1 --no-min-parents" one five
'
-test_expect_success 'set up dodecapus' '
+test_expect_success 'dodecapus' '
+ roots= &&
for i in 1 2 3 4 5 6 7 8 9 10 11
do
- git checkout -b root$i five || return
- test_commit $i || return
+ git checkout -b root$i five &&
+ test_commit $i &&
+ roots="$roots root$i" ||
+ return
done &&
git checkout master &&
test_tick &&
- git merge -m dodecapus root{1,2,3,4,5,6,7,8,9,10,11} &&
- git tag dodecapus
-'
-
-test_expect_success 'test with dodecapus' '
+ git merge -m dodecapus $roots &&
+ git tag dodecapus &&
check_revlist "--min-parents=4" dodecapus tetrapus &&
check_revlist "--min-parents=8" dodecapus &&