Index: user/uqs/git_conv/git_conv
===================================================================
--- user/uqs/git_conv/git_conv	(revision 244083)
+++ user/uqs/git_conv/git_conv	(revision 244084)
@@ -1,103 +1,99 @@
 #!/bin/sh
 #
 # Repository creation and setup
 #
 # Simple for svn2git repos, need to run against local paths, using rules files in ~git/*.rules
 # - First svn2git run will create target git repo, then
 # - git remote add github github.com:freebsd/freebsd.git
 # - git config --add remote.github.push '+refs/heads/master:refs/heads/master'
 # - git config --add remote.github.push '+refs/heads/stable/*:refs/heads/stable/*'
 # - git config --add remote.github.push '+refs/heads/projects/*:refs/heads/projects/*'
 # - git config --add remote.github.push '+refs/notes/*:refs/notes/*'
 # - etc.
 # - touch freebsd-base.git/git-daemon-export-ok
 # - svn2git/svn-all-fast-export --rules ~git/freebsd-base.rules --add-metadata-notes --identity-domain FreeBSD.org /home/svn/base
 # - git push github
 # done. Analog steps needed for doc and ports.
 #
 # For git-svn it's a bit more involved. We use separate working dirs, but push to the same destination repo.
 # - git svn init -Thead -rewrite-root=svn+ssh://svn.freebsd.org/base file:///home/svn/base src-head.git
 # - cd src-head.git
 # - git svn fetch -r 0:1000
 # - git remote add github github.com:freebsd/freebsd.git
 # - git config --add remote.github.push '+refs/remotes/trunk:refs/heads/svn_head'
 # - git svn rebase
 # - git push github
 
 LOCK=/tmp/gitconv.lock
 
 : ${BASE=/home/git}
 : ${RULES_DIR=${BASE}}
 : ${SVN2GIT=${BASE}/svn2git/svn-all-fast-export}
 
 : ${SRC_REPO=/home/svn/base}
 : ${DOC_REPO=/home/svn/doc}
 : ${PORTS_REPO=/home/svn/ports}
 
 trap 'rm -f ${LOCK} ; exit 1' 1 2 3 15
 if ! shlock -p $$ -f ${LOCK}; then
     echo "Locked by `cat ${LOCK}`, running too long? Please fix ..." >&2
     exit 1
 fi
 
 svn2git()
 {
-    local rules source target dest
+    local rules source target dest d
     rules=$1; shift
     source=$1; shift
     dest="$@"
 
     # FIXME: error prone, yuck
     target=${rules%.rules}.git
     target=`basename $target`
 
     test -d "$BASE" || { echo "$BASE is not a directory, exiting ..." >&2; exit 1; }
     test -f "$rules" || { echo "$rules do not exist, exiting ..." >&2; exit 1; }
 
     cd $BASE
     echo "Converting $source to $target using svn2git"
     $SVN2GIT --add-metadata-notes --identity-domain FreeBSD.org \
 	--rules $rules $source
     if [ $? != 0 ]; then
 	echo "Error in svn2git conversion of $source" >&2
 	exit 1
     fi
 
     echo "Pushing $target to $dest"
-    cd $target && for d in $dest; do git push $d || break; done
-    if [ $? != 0 ]; then
-	echo "Error in pushing to $dest" >&2
-	exit 1
-    fi
+    cd $target && for d in $dest; do
+	git push $d || { echo "Error in pushing to $dest" >&2; exit 1; }
+    done
 }
 
 gitsvn()
 {
-    local target dest
+    local target dest d
     target=$1; shift
     dest="$@"
 
     test -d "$BASE/$target/.git" || { echo "$BASE/$target is not a git repo, exiting ..." >&2; exit 1; }
     cd $BASE/$target
     echo "Converting $target using git-svn"
     git svn rebase
     if [ $? != 0 ]; then
 	echo "Error in git-svn conversion of $target" >&2
 	exit 1
     fi
 
     echo "Pushing $target to $dest"
-    for d in $dest; do git push $d || break; done
-    if [ $? != 0 ]; then
-	echo "Error in pushing to $dest" >&2
-	exit 1
-    fi
+    for d in $dest; do
+	git push $d || { echo "Error in pushing to $dest" >&2; exit 1; }
+    done
 }
 
 gitsvn src-head.git github
 gitsvn doc-head.git github
 gitsvn ports-head.git github
 
 svn2git $RULES_DIR/freebsd.rules ${SRC_REPO} github
 svn2git $RULES_DIR/freebsd-doc.rules ${DOC_REPO} github
 svn2git $RULES_DIR/freebsd-ports.rules ${PORTS_REPO} github