From: Sandro Santilli <strk@keybit.net>
Date: Wed, 13 Apr 2011 08:08:46 +0000 (+0000)
Subject: Have 'svnrebase' rule use an authors file rather than command. Lets older git do... 
X-Git-Tag: 2.0.0alpha1~1780
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a663f249fbef188bf3dcd76ff457868306c3f4c;p=postgis

Have 'svnrebase' rule use an authors file rather than command. Lets older git do it (old git on the machine currently mirroring the codebase to github).

git-svn-id: http://svn.osgeo.org/postgis/trunk@7022 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/.gitignore b/.gitignore
index 2713d4fea..a6368fd75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,3 +69,4 @@ topology/test/load_topology.sql
 topology/test/topo_predicates.sql
 topology/topology.sql
 topology/topology.sql.in
+authors.git
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 4ba84ce98..daf8d77dd 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -165,8 +165,11 @@ astyle:
 commit:
 	$(MAKE) astyle && $(MAKE) clean && $(MAKE) check && svn commit
 
-svnrebase:
-	git svn rebase --authors-prog author.sh
+authors.git: authors.svn
+	sed -e 's/:/ = /' authors.svn > authors.git
+
+svnrebase: authors.git
+	git svn rebase --authors-file authors.git
 
 
 .PHONY: utils liblwgeom ChangeLog.svn raster
diff --git a/author.sh b/author.sh
deleted file mode 100755
index c25035f67..000000000
--- a/author.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-if test x"$1" = "x"; then
-  echo "Usage: $0 <nick>" >&2
-  exit 1
-fi
-
-authors_file="`dirname $0`/authors.svn"
-
-if test ! -e "${authors_file}"; then
-  echo "Authors file ${authors_file} does not exist" >&2
-  exit 1
-fi
-
-nick="$1"
-grep  "^${nick}" "${authors_file}" | cut -d: -f2