New import.

diff --git a/cvs2git-inc.sh b/cvs2git-inc.sh
index bb98aaf..898974c 100755 (executable)
--- a/cvs2git-inc.sh
+++ b/cvs2git-inc.sh
@@ -44,7 +44,7 @@ if [ ! -d "jra1mw-transfer/.git" ]; then
        cd jra1mw-transfer
        git remote add cvssync ../jra1mw-cvssync.git
        git fetch cvssync
-       for b in branch_RC31_3 branch_2_0 branch_2_1 branch_workflow; do
+       for b in branch_RC31_3 branch_2_0 branch_2_1 branch_workflow branch_3_0; do
                echo $b
                git checkout -b $b origin/$b || break
                #zadat tag do skriptu!
@@ -60,8 +60,9 @@ git fetch cvssync
 echo "\
 branch_RC31_3   4316f8ac93d4cfa61b471676c2f81e70f62f1b69
 branch_2_0      385a0a242b5e4666192f1198df92d7d451c79164
-branch_2_1      46021c94148d9d688604bcdbec0344e946d70053
+branch_2_1      6ed42184743a87910afc8c720509003301ec6c17
 branch_workflow a0a362418b99167f40d1328ea8a934b147372329
+branch_3_0     a83b40bd71315193486807eee5d89f5c0e052497
 master          2ef3e3661369d1c14713c237b54b62f8f802926b" | while read branch start; do
        echo "$start..cvssync/$branch"
        git checkout $branch || break

diff --git a/cvs2git.sh b/cvs2git.sh
index b4225cd..9c499e8 100755 (executable)
--- a/cvs2git.sh
+++ b/cvs2git.sh
@@ -48,6 +48,8 @@ cd jra1mw
 # udělat až při hlavnim rebase
 #git rebase -i `git show '--format=%H' ':/^\[no change - only corrected log message\]' | head -n 1`^
 
+git tag git_import_src
+
 # restructuring
 #let's declare restructuring at 2007-11-07 16:12:07
 rm -rf org.glite.lb.server-bones org.glite.lb.proxy org.glite.lb.client-interface org.glite.lbjp-utils.db org.glite.lbjp-utils.jobid org.glite.lbjp-utils.maildir org.glite.lbjp-utils.server-bones org.glite.lbjp-utils.trio org.glite.lb-utils org.glite.lb-utils.context org.glite.lb-utils.db org.glite.lb-utils.jobid org.glite.lb-utils.server-bones org.glite.lb-utils.trio
@@ -76,6 +78,8 @@ git commit -a -m"cvs2git: MyProxy startup script no longer needed"
 rm -rf org.glite.security.gss org.glite.security.gsoap-plugin
 git commit -a -m'cvs2git: merging security modules moved to lbjp-common subsystem'
 
+git tag git_import_dst
+
 # reword 'register job to JP when it became known for JP'
 #    register job to JP when it became known for LB (even grey job) and not any
 #    more

diff --git a/git.wiki b/git.wiki
index cf5dd3c..8fb2f6b 100644 (file)
--- a/git.wiki
+++ b/git.wiki
@@ -124,7 +124,8 @@ git cvsimport -d /home/valtri/jra1mw.cvs -i -m -a -A ../authors.txt jra1mw
 
 == Make private repository public (shareable) ==
 
-git config --type bool core.share=true
+git config core.bare true
+git config core.sharedrepository 1
 find .git -type d -exec chmod g+sx {} \;
 find .git -exec chmod g+w {} \;
 mv .git/hooks/post-update.sample .git/hooks/post-update