简体   繁体   中英

When I do “git svn rebase” it fetches the svn author names instead of the git author names

I have used git svn clone -A authors.txt ... to clone an svn repository. My authors.txt had entries like this:

svnid = Firstname Lastname <Firstname.Lastname@example.com>

That worked fine and in git log the authors look like:

Author: Firstname Lastname <firstname.lastname@example.com>

Now when I do git svn rebase -A authors.txt the authors for the new entries look like this:

Author: svnid <svnid@12345678-1234-1234-1234-123456789abc>

I used the accepted answer from " Retroactively Correct Authors with Git SVN? " to fix it, but after the next git svn rebase -A authors.txt the authors are destroyed again.

What can I do to preserve the proper author names?

EDIT: I'm using git version 1.7.6.msysgit.0 on Windows obviously.

svn.authorsfile is a bit of artistic license (aka bug). If you open .git/config file in $EDITOR you will see something like:

[svn-remote "svn"]
url = https://crosswire.org/svn/sword
fetch = trunk:refs/remotes/trunk
branches = branches/*:refs/remotes/*
tags = tags/*:refs/remotes/tags/*

add the line

authorsfile = .git/svn/authors.txt

as the last line of that section (and put your authors.txt file to .git/svn/ directory, of course).

The technical post webpages of this site follow the CC BY-SA 4.0 protocol. If you need to reprint, please indicate the site URL or the original address.Any question please contact:yoyou2525@163.com.

 
粤ICP备18138465号  © 2020-2024 STACKOOM.COM