From 52f3ced3f1645f80a0300ac801ecb94318c032b9 Mon Sep 17 00:00:00 2001
From: Kacper Kornet <draenog@pld-linux.org>
Date: Mon, 28 Mar 2011 13:00:42 +0100
Subject: [PATCH] Use global GIT_WORK_TREE and GIT_DIR

---
 builder.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/builder.sh b/builder.sh
index 6dd722e..202f468 100755
--- a/builder.sh
+++ b/builder.sh
@@ -713,6 +713,8 @@ init_builder() {
 		REPO_DIR="."
 		PACKAGE_DIR="."
 	fi
+	export GIT_WORK_TREE=$PACKAGE_DIR
+	export GIT_DIR=$PACKAGE_DIR/.git
 
 	__PWD=$(pwd)
 }
@@ -734,7 +736,7 @@ get_spec() {
 
 	if [ "$NOCVSSPEC" != "yes" ]; then
 		if [ -d "$ASSUMED_NAME/.git" ]; then
-			GIT_DIR=$PACKAGE_DIR/.git git fetch origin || Exit_error err_no_spec_in_repo
+			git fetch origin || Exit_error err_no_spec_in_repo
 		elif [ "$ADD_PACKAGE_CVS" = "yes" ]; then
 			if [ ! -r "$ASSUMED_NAME/$SPECFILE" ]; then
 				echo "ERROR: No package to add ($ASSUMED_NAME/$SPECFILE)" >&2
@@ -775,9 +777,9 @@ get_spec() {
 	fi
 
 	if [ -n "$CVSTAG" ]; then
-		GIT_WORK_TREE=$PACKAGE_DIR GIT_DIR=$PACKAGE_DIR/.git git checkout "$CVSTAG" || exit
-		GIT_DIR=$PACKAGE_DIR/.git git symbolic-ref -q HEAD > /dev/null &&
-			GIT_WORK_TREE=$PACKAGE_DIR GIT_DIR=$PACKAGE_DIR/.git git merge '@{u}'
+		git checkout "$CVSTAG" || exit
+		git symbolic-ref -q HEAD > /dev/null &&
+			git merge '@{u}'
 	fi
 
 	if [ ! -f "$ASSUMED_NAME/$SPECFILE" ]; then
-- 
2.44.0