Initial work towards collab

testcases/t9302-fast-filter.sh

@@ -129,26 +129,33 @@ test_expect_success 'create_fast_export_output.py' '
 '
 
 test_expect_success 'collab' '
-	rm -rf new &&
-	mkdir new &&
-	cd new &&
-	git init &&
-	PYTHONPATH=$TEST_DIRECTORY/..: $TEST_DIRECTORY/lib-usage/collab clone .. --exclude=secret &&
-	test 18dd5834 = $(git rev-parse --short=8 refs/remotes/collab/master) &&
-	git merge collab/master &&
-	cd .. &&
-	echo content > another-file &&
-	git add another-file &&
-	git commit -m "Yet another commit" &&
-	cd new &&
-	PYTHONPATH=$TEST_DIRECTORY/..: $TEST_DIRECTORY/lib-usage/collab pull-grafts &&
-	test d042f798 = $(git rev-parse --short=8 refs/remotes/collab/master) &&
-	git merge collab/master &&
-	echo more content >> another-file &&
-	git commit -m "And yet another commit" another-file &&
-	PYTHONPATH=$TEST_DIRECTORY/..: $TEST_DIRECTORY/lib-usage/collab push-grafts &&
-	cd .. &&
-	test d50d11fc = $(git rev-parse --short=8 refs/remotes/collab/master)
+	setup collab_source &&
+	git init collab &&
+	(
+		cd collab &&
+		$TEST_DIRECTORY/lib-usage/collab clone ../collab_source --exclude=secret &&
+		test 18dd5834 = $(git rev-parse --short=8 refs/remotes/collab/master) &&
+		git merge collab/master
+	) &&
+	(
+		cd collab_source &&
+		echo content > another-file &&
+		git add another-file &&
+		git commit -m "Yet another commit"
+	) &&
+	(
+		cd collab &&
+		$TEST_DIRECTORY/lib-usage/collab pull-grafts &&
+		test d042f798 = $(git rev-parse --short=8 refs/remotes/collab/master) &&
+		git merge collab/master &&
+		echo more content >> another-file &&
+		git commit -m "And yet another commit" another-file &&
+		$TEST_DIRECTORY/lib-usage/collab push-grafts
+	) &&
+	(
+		cd collab_source &&
+		test d50d11fc = $(git rev-parse --short=8 refs/remotes/collab/master)
+	)
 '
 
 test_done