undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ab/test-cleanup' into maint

Browse Source 
* ab/test-cleanup:
  Turn setup code in t2007-checkout-symlink.sh into a test
  Move t6000lib.sh to lib-*
This commit is contained in:
Junio C Hamano 2010-06-21 05:39:02 -07:00
commit 6f79d66891
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
t/t6000lib.sh → t/lib-t6000.sh
View File

4
t/t2007-checkout-symlink.sh
View File

@ -44,8 +44,10 @@ test_expect_success 'switch from symlink to dir' '
' '
test_expect_success 'Remove temporary directories & switch to master' '
rm -fr frotz xyzzy nitfol && rm -fr frotz xyzzy nitfol &&
git checkout -f master || exit git checkout -f master
'
test_expect_success 'switch from dir to symlink' ' test_expect_success 'switch from dir to symlink' '

2
t/t6002-rev-list-bisect.sh
View File

@ -5,7 +5,7 @@
test_description='Tests git rev-list --bisect functionality' test_description='Tests git rev-list --bisect functionality'
. ./test-lib.sh . ./test-lib.sh
. "$TEST_DIRECTORY"/t6000lib.sh # t6xxx specific functions . "$TEST_DIRECTORY"/lib-t6000.sh # t6xxx specific functions
# usage: test_bisection max-diff bisect-option head ^prune... # usage: test_bisection max-diff bisect-option head ^prune...
# #

2
t/t6003-rev-list-topo-order.sh
View File

@ -6,7 +6,7 @@
test_description='Tests git rev-list --topo-order functionality' test_description='Tests git rev-list --topo-order functionality'
. ./test-lib.sh . ./test-lib.sh
. "$TEST_DIRECTORY"/t6000lib.sh # t6xxx specific functions . "$TEST_DIRECTORY"/lib-t6000.sh # t6xxx specific functions
list_duplicates() list_duplicates()
{ {

2
t/t6101-rev-parse-parents.sh
View File

@ -6,7 +6,7 @@
test_description='Test git rev-parse with different parent options' test_description='Test git rev-parse with different parent options'
. ./test-lib.sh . ./test-lib.sh
. "$TEST_DIRECTORY"/t6000lib.sh # t6xxx specific functions . "$TEST_DIRECTORY"/lib-t6000.sh # t6xxx specific functions
date >path0 date >path0
git update-index --add path0 git update-index --add path0