From baf9ae321542e8b7ccda744424274d782b048678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <stikonas@gmail.com>
Date: Wed, 12 Nov 2008 00:40:34 +0200
Subject: [PATCH] Git-svn support moved to git-support branch.

---
 update.sh | 43 ++++++++-----------------------------------
 variables |  2 --
 2 files changed, 8 insertions(+), 37 deletions(-)

diff --git a/update.sh b/update.sh
index 3b8f3ac..272fde8 100755
--- a/update.sh
+++ b/update.sh
@@ -37,36 +37,18 @@ if [ ! $MSGINIT ]; then
 	exit 1
 fi
 
-if [ $GIT -eq 1 ] && [ ! $GITSVN ]; then
-	echo -e $RED"git-svn is unavailable. svn will be used."$ENDCOLOR
-	GIT=0
-fi
-
-if [ $GIT -eq 1 ] && [ $GITSVN ]; then
-	SVN="$GITSVN clone"
-fi
-
 echo -e "Language: $RED$LCODE"$ENDCOLOR
 echo ""
 
 if [ ! -z $TRUNK ]; then
-	if [ -e $TRUNK/.git ] || [ -e $TRUNK/.svn ]; then
+	if [ -e $TRUNK/.svn ]; then
 		echo -e "Updating repository: "$BLUE"trunk"
 		cd $TRUNK
-		if [ $GIT -eq 1 ]; then
-			$GITSVN rebase
-		else
-			$SVN update
-		fi
+		$SVN update
 		cd ..
 	else
-		echo -e "Downloading repository: "$BLUE"trunk"
-		if [ $GIT -eq 1 ]; then
-			SVN="$GITSVN clone"
-		else
-			SVN="$SVN checkout"
-		fi
-		$SVN "$REPO/$TRUNK/po" $TRUNK
+		echo -e "Checking out repository: "$BLUE"trunk"
+		$SVN checkout "$REPO/$TRUNK/po" $TRUNK
 	fi
 	tput sgr0
 	if [ ! -e "$PREFIX-$TRUNK" ]; then
@@ -75,23 +57,14 @@ if [ ! -z $TRUNK ]; then
 fi
 
 for BRANCH in $BRANCHES; do
-  	if [ -e $BRANCH/.git ] || [ -e $BRANCH/.svn ]; then
+  	if [ -e $BRANCH/.svn ]; then
 		echo -e "Updating repository: $BLUE$BRANCH"
 		cd $BRANCH
-		if [ $GIT -eq 1 ]; then
-			$GITSVN rebase
-		else
-			$SVN update
-		fi
+		$SVN update
 		cd ..
 	else
-		echo -e "Downloading repository: $BLUE$BRANCH"
-		if [ $GIT -eq 1 ]; then
-			SVN="$GITSVN clone"
-		else
-			SVN="$SVN checkout"
-		fi
-		$SVN "$REPO/branches/$BRANCH/po" $BRANCH
+		echo -e "Checking out repository: $BLUE$BRANCH"
+		$SVN checkout "$REPO/branches/$BRANCH/po" $BRANCH
 	fi
 	tput sgr0
 	if [ ! -e "$PREFIX-$BRANCH" ]; then
diff --git a/variables b/variables
index 000908a..516f4a6 100644
--- a/variables
+++ b/variables
@@ -22,7 +22,6 @@ TRUNK="trunk" # "trunk" or ""
 
 # Options
 LCODE="lt" # Language code. Only 1 language is supported.
-GIT=0 # Enable (1) or disable (0) git-svn.
 
 #Paths
 MDIR="mo"
@@ -37,7 +36,6 @@ ISUTF8=`which isutf8 2> /dev/null`
 TAR=`which tar 2> /dev/null`
 BZIP2=`which bzip2 2> /dev/null`
 DIFF=`which diff 2> /dev/null`
-GITSVN=`which git-svn 2> /dev/null`
 
 #Colors
 RED="\033[0;31m"