remove svn references from prepare-commit.sh and make it work from an…

…ywhere in the repository
qgis · May 26, 2016 · aef3dd4 · aef3dd4
1 parent d4802e5
commit aef3dd4
Showing 1 changed file with 7 additions and 16 deletions.
diff --git a/scripts/prepare-commit.sh b/scripts/prepare-commit.sh
@@ -14,8 +14,11 @@
 #                                                                         #
 ###########################################################################
 
+TOPLEVEL=$(git rev-parse --show-toplevel)
 
-PATH=$(git rev-parse --show-toplevel)/scripts:$PATH
+PATH=$TOPLEVEL/scripts:$PATH
+
+cd $TOPLEVEL
 
 if ! type -p astyle.sh >/dev/null; then
 	echo astyle.sh not found
@@ -37,28 +40,16 @@ fi
 set -e
 
 # determine changed files
-if [ -d .svn ]; then
+MODIFIED=$(git status --porcelain| sed -ne "s/^ *[MA]  *//p" | sort -u)
-	MODIFIED=$(svn status | sed -ne "s/^[MA] *//p")
-elif [ -d .git ]; then
-	MODIFIED=$(git status --porcelain| sed -ne "s/^ *[MA]  *//p" | sort -u)
-else
-	echo No working copy
-	exit 1
-fi
 
 if [ -z "$MODIFIED" ]; then
 	echo nothing was modified
 	exit 0
 fi
 
 # save original changes
-if [ -d .svn ]; then
+REV=$(git log -n1 --pretty=%H)
-	REV=r$(svn info | sed -ne "s/Revision: //p")
+git diff >sha-$REV.diff
-	svn diff >rev-$REV.diff
-elif [ -d .git ]; then
-	REV=$(git log -n1 --pretty=%H)
-	git diff >sha-$REV.diff
-fi
 
 ASTYLEDIFF=astyle.$REV.diff
 >$ASTYLEDIFF