diff --git a/git-cvs2git.sh b/git-cvs2git.sh index 3a78c80..2649bff 100755 --- a/git-cvs2git.sh +++ b/git-cvs2git.sh @@ -167,7 +167,7 @@ mkdir -p $CVSFiles # Make sure credentials taken from store # The first time you pull or push it will ask for credentials and then save them in a file. -git config --global credential.helper store $QUIET +git config --global credential.helper store # # Clone the CVS repository @@ -321,7 +321,7 @@ fi # Pull in the auto created or updated files cd $GITFiles #GIT_SSL_NO_VERIFY=true git clone "$GITEAHOST/$ORGGITEA/$1.git" -git clone "$GITEAHOST/$ORGGITEA/$1.git" $QUIET +git clone "$GITEAHOST/$ORGGITEA/$1.git" if [ ! -d $GITFiles/$1 ] ; then echo "ERROR*******Unable to access the new repo directory for $HTTP_URL $GITFiles/$1" @@ -719,20 +719,20 @@ cd $GITFiles/$1 git add -A echo "$1 git status" >>gitstatus.log git status >>gitstatus.log -git status +if [ $DEBUG ] ; then git status ; fi COMMENT="initial commit of file from CVS for $1 on `date`" git commit -m "$COMMENT" $QUIET # push the converted git repository to the remote -git remote remove origin $QUIET -git remote add origin "$GITEAHOST/$ORGGITEA/$1.git" $QUIET +git remote remove origin +git remote add origin "$GITEAHOST/$ORGGITEA/$1.git" #GIT_SSL_NO_VERIFY=true git push --force -u $QUIET origin master -git push --force -u $QUIET origin master $QUIET +git push --force -u $QUIET origin master # Now create the version and release tag for these files RELEASE=`rpm --queryformat '%{release}\n' --specfile $NAME.spec | head -n 1` TAG=$VERSION-$RELEASE -git tag -a $TAG -m "$COMMENT" $QUIET +git tag -a $TAG -m "$COMMENT" git push origin $TAG $QUIET echo "Created $1 Repo: $HTTP_URL - Comment:$COMMENT tag:$TAG"