Have 'svnrebase' rule use an authors file rather than command. Lets older git do...

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

diff --git a/.gitignore b/.gitignore
index 2713d4fea7de0768c3b82a5f6bfc69d064ac7259..a6368fd753b0b82eb0404a55bcb9c1d75a373d47 100644 (file)
--- 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 4ba84ce98ce682d939ebdd5bcdeb2cdab2c004b4..daf8d77dd9d3e2af1fbe739fa17543eba1fd36c9 100644 (file)
--- 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 (executable)
index c25035f..0000000
--- 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