summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2010-10-16 10:19:19 +0200
committerDaniel Friesel <derf@finalrewind.org>2010-10-16 10:19:19 +0200
commit5ceca506182982aac6dbf1041b7e120dca00327a (patch)
treef5bc169ffcb79cbf0b79443f3d0f25740907dfec /test
parent84e2e6aef4ef92e5e416e4f762993ccb606bfa30 (diff)
Always use git origins, remove GIT_USE_ORIGIN setting
Diffstat (limited to 'test')
-rwxr-xr-xtest/main34
1 files changed, 15 insertions, 19 deletions
diff --git a/test/main b/test/main
index f69f81f..317058a 100755
--- a/test/main
+++ b/test/main
@@ -62,26 +62,22 @@ echo "# ct add (no such repo)"
echo "# ct add (already installed)"
! ct add caretaker
-for conf_origin in 0 1; {
- echo "## GIT_USE_ORIGIN=$conf_origin"
- echo "GIT_USE_ORIGIN=$conf_origin" >> $test_home/.config/caretaker/caretaker.conf
- for repo in ra ra-bare; {
- file=${repo%-*}
- if [[ $repo == *-bare ]] {
- echo "## bare repository"
- complement=$file
- } else {
- echo "## non-bare repository"
- complement=${repo}-bare
- }
- source $tests/add
- source $tests/prereqs
- cd $test_pdir/$repo
- source $tests/push
- cd $test_pdir
- source $tests/pull-prepare
- source $tests/remove
+for repo in ra ra-bare; {
+ file=${repo%-*}
+ if [[ $repo == *-bare ]] {
+ echo "## bare repository"
+ complement=$file
+ } else {
+ echo "## non-bare repository"
+ complement=${repo}-bare
}
+ source $tests/add
+ source $tests/prereqs
+ cd $test_pdir/$repo
+ source $tests/push
+ cd $test_pdir
+ source $tests/pull-prepare
+ source $tests/remove
}
rm -rf $test_pdir $test_proot $test_home