Put the authors file in svn-all-fast-export format.

[invirt/scripts/git-migration.git] / git-migrate-fast.sh

diff --git a/git-migrate-fast.sh b/git-migrate-fast.sh
index a7f2ab2..d63a20f 100755 (executable)
--- a/git-migrate-fast.sh
+++ b/git-migrate-fast.sh
@@ -13,7 +13,7 @@ sed -n 's/^create repository // p' ../rules | while read repo; do
     mkdir -p "$repo" && GIT_DIR="$repo" git init --bare
 done
 
-svn-all-fast-export --identity-map <(sed 's/= //' ../authors) ../rules "$SVN"
+svn-all-fast-export --identity-map ../authors ../rules "$SVN"
 
 sed -n 's/^create repository // p' ../rules | while read repo; do
     ! [ -e "$repo/refs/heads/tags" ] || \
@@ -48,10 +48,9 @@ rm -rf info/grafts refs/original
 popd
 
 pushd packages/python-routefs.git
-git fetch git://github.com/ebroder/python-routefs.git debian:refs/heads/debian
-git tag -f 1.0.1-1 2fc1d90
+git fetch -t git://github.com/ebroder/python-routefs.git
+git branch -f upstream 1.0.1
 git branch -f master 1.0.1-1
-git branch -d debian
 popd
 
 echo