Regarding yesterdays post

I figured out why I got the problem with multiple branches and tags lines in the git config. The reason is that I had specified an authors file when I first initialized my repository from Subversion. There were several authors in the subversion repository that were missing from my authors file. So every time I got an error like that I just updated the authors file and did a new git svn clone ... I thought this did no harm since it has worked before but every time I cloned I got a new set of duplicated lines in the git config. Nice to know...

Git Svn : Refspec glob conflict

At work we use Subversion as our current source control tool. Which is OK but I prefer using Git. So to get my fix while I wait for a conversion to Git at work I use git svn as my subversion client. Usually this is painless but sometimes, like today, problems show up.

I did a regular git svn rebase and got this problem in return:

$ git svn rebase
W: Refspec glob conflict (ref: refs/remotes/trunk):
expected path: path/to/app/branches/trunk
    real path: path/to/app/trunk
Continuing ahead with path/to/app/trunk

W: Refspec glob conflict (ref: refs/remotes/trunk):
expected path: path/to/app/branches/trunk
    real path: path/to/app/trunk
Continuing ahead with path/to/app/trunk

W: Refspec glob conflict (ref: refs/remotes/trunk):
expected path: path/to/app/branches/trunk
    real path: path/to/app/trunk
Continuing ahead with path/to/app/trunk

W: Refspec glob conflict (ref: refs/remotes/trunk):
expected path: path/to/app/branches/trunk
    real path: path/to/app/trunk
Continuing ahead with path/to/app/trunk

W: Refspec glob conflict (ref: refs/remotes/trunk):
expected path: path/to/app/branches/trunk
    real path: path/to/app/trunk
Continuing ahead with path/to/app/trunk

W: Refspec glob conflict (ref: refs/remotes/trunk):
expected path: path/to/app/branches/trunk
    real path: path/to/app/trunk
Continuing ahead with path/to/app/trunk

Current branch master is up to date.

I'm not the first to have this problem so I found an explanation (and solution) at CodeUtopia. The problem was that git had spontaneously duplicated lines in .git/config that points to the remote trunk, tags and branches in subversion. I removed the duplicates and everything was fine again.