git-migration: pld-git.sh - use cvs2git.options (requries cvs2svn > rr15319...

[draenog]

Author: draenog                      Date: Wed Feb  9 09:52:18 2011 GMT
Module: git-migration                 Tag: HEAD
---- Log message:
- use cvs2git.options (requries cvs2svn > rr15319) and cvs2git_fixes.sh
- use GIT_DIR

---- Files affected:
git-migration:
   pld-git.sh (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: git-migration/pld-git.sh
diff -u git-migration/pld-git.sh:1.11 git-migration/pld-git.sh:1.12
--- git-migration/pld-git.sh:1.11	Tue Feb  8 16:33:19 2011
+++ git-migration/pld-git.sh	Wed Feb  9 10:52:13 2011
@@ -101,14 +101,14 @@
 		# faster startup, skip existing ones for now
 		test -d $gitdir/$pkg && continue
 
-		install -d $gitdir/$pkg
-		cd $gitdir/$pkg
+		export GIT_DIR=$gitdir/$pkg
 		git init
-		cvs2git --use-rcs --blobfile=.git/cvs2git.blob --dumpfile=.git/cvs2git.dump --username=cvs --fallback-encoding=latin2 ../../packages/$pkg
-		git fast-import --export-marks=.git/cvs2git.marks < .git/cvs2git.blob
-		git fast-import --import-marks=.git/cvs2git.marks < .git/cvs2git.dump
+		CVS_REPO=packages/$pkg cvs2git --options=cvs2git.options
+		git fast-import --export-marks=cvs2svn-tmp/cvs2git.marks < cvs2svn-tmp/git-blob.dat
+		git fast-import --import-marks=cvs2svn-tmp/cvs2git.marks < cvs2svn-tmp/git-dump.dat
+		cvs2git_fixes.sh $pkg
 		git checkout master
-		cd ../../
+		unset GIT_DIR
 	done
 }
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/git-migration/pld-git.sh?r1=1.11&r2=1.12&f=u