CVS -> git -> GitHub no longer working (git change?)

I've been using cvs2git for quite a while and have been very pleased!  I
recently upgraded my CVS server OS (to OpenBSD 6.2) and have found my
script no longer works.  Not being conversant in git, I could use some
help!  The script is as follows, edited for brevity and content:

 cd /tmp/example
 cvs2git \
  --blobfile=3Dgit-blob.dat \
  --dumpfile=3Dgit-dump.dat \
  [email protected] \
   /path/to/cvs/repo
 mkdir example.git
 cd example.git
 git init
 cd .git
 # Can be shortened to a single cat, I think?
 git fast-import --export-marks=3D../../git-marks.dat < ../../git-blob.dat
 git fast-import --import-marks=3D../../git-marks.dat < ../../git-dump.dat
 git remote add origin https://github.com/example/repo.git
 cd ..
 git checkout
 git push --tags -u origin master

This used to work, but now doesn't, claiming, at the end of the usual
output:

Username for 'https://github.com':
Password for 'https://[email protected]@github.com':
To https://github.com/example/repo.git
 ! [rejected]        master -> master (fetch first)
 ...all tags follow...
error: failed to push some refs to 'repo'
hint: Updates were rejected because the tag already exists in the remote.

Running without the "--tags" also doesn't work:

Username for 'https://github.com':
Password for 'https://[email protected]@github.com':
To repo
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'repo'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushin=
g
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details

I only push to the GitHub repository in this one place.

Any suggestions for how I might remedy this script?

Best,

Kristaps

------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=3D1670&dsMessageId=3D=
3370675

To unsubscribe from this discussion, e-mail: [[email protected]=
ris.org].