global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-13 02:13:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mg/rev-list-n-parents' into next

Browse Source 
* mg/rev-list-n-parents:
  tests: avoid nonportable {foo,bar} glob
This commit is contained in:
Junio C Hamano
2011-03-24 15:13:43 -07:00
parent 46300131fe 482ce70e14
commit 95e3e20f84
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
t/t6009-rev-list-parent.sh
View File

@@ -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 &&