From 5ceca506182982aac6dbf1041b7e120dca00327a Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Sat, 16 Oct 2010 10:19:19 +0200
Subject: Always use git origins, remove GIT_USE_ORIGIN setting

---
 test/main | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

(limited to 'test')

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
-- 
cgit v1.2.3