Adding missing commits to git-svn converted repository

Question

My scenario:

Project was converted from SVN to Git (via somewhat older version of git-svn):

SVN branches were converted to branches:

for branch in `git branch -r`; do
    git branch $branch refs/remotes/$branch
done

SVN tags were converted to tags:

git for-each-ref refs/remotes/tags | while read r; do
   sha1=$(git rev-parse $r)

   # stuff for formatting of committer, etc

   git tag ... $sha1

   # Remove the tags/* ref
   git update-ref -d $r
done

Problem:

There were a handful of commits and tags that were committed to SVN before we fully switched over to Git.

How do I get just those commits and tags added to the Git repo?

I've tried doing git svn init, git svn fetch, but it seemed to be repeating the whole process - but I obviously need the git commits to be the same otherwise I've created a disjoint branch.l

Have there been commits and fixes to the git repo since the conversion? — TriskalJM
– TriskalJM, Commented Apr 8, 2016 at 19:53
@TriskalJM Yes, but not in any way that should create a divergent branch. — Jonathon Reinhart
– Jonathon Reinhart, Commented Apr 8, 2016 at 20:00

TriskalJM · Accepted Answer · 2016-04-08 20:05:20Z

1

Use the command git svn rebase to pull in new commits.

answered Apr 8, 2016 at 20:05

TriskalJM

2,4671 gold badge21 silver badges20 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

Adding missing commits to git-svn converted repository

My scenario:

Problem:

1 Answer 1

Comments

Your Answer

Hot Network Questions

Collectives™ on Stack Overflow

My scenario:

Problem:

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Related