Re: [AD] switching to git, 2012 edition

[Peter Wang <novalazy@xxxxxxxxxx>]

On Fri, 29 Jun 2012 18:18:41 +0200, Elias Pschernig <elias.pschernig@xxxxxxxxxx> wrote:
> On Thu, 28 Jun 2012 10:30:12 +1000
> Peter Wang <novalazy@xxxxxxxxxx> wrote:
> > 
> > My import has a mistake.  There are hundreds of commits falsely
> > credited to me because of backports.  Most of them have an extra
> > "From:" line in the log message indicating the original author.  git
> > svn has an option --use-log-author to use that as the real author.
> > It would be nice to get it right in the import.
> > 
> 
> Ok, I re-ran it with your authors.txt (but example.org changed to
> users.sourceforge.net) and the --use-log-author option.

Great.

> 
> (Interestingly enough --use-log-author seems to have merged the authors
> to @users.sourceforge.net even though those logs have
> @example.org names.)

The @example.org names are still on the 5.0 branch.  I ran the following
script to fix that, plus Trent's username, and normalise my email address.
How should I upload my copy?  Just push it on top of the current one?

> Anyway, I did a push --mirror to here:
> 
> ssh://USER@xxxxxxxxxxxxxxxxxxxxxxxxx/gitroot/alleg/allegro
> 
> Sourceforge's gitweb of it is here:
> 
> http://alleg.git.sourceforge.net/git/gitweb.cgi?p=alleg/allegro;a=summary
> 
> (there's also the auto-created "alleg" repository by SF which I didn't
> touch and intend to delete)
> 
> It does seem to have all of the branches and tags. The old branches/5.1
> branch is now the master branch. We could probably name it 5.1
> instead of master but unlike SVN-without-trunk as we had before, a
> git-without-master appears to not be such a good idea...

Really?  It's not a big deal, but I like being able to write
'git diff 5.0 5.1'.

Peter

#!/bin/zsh -e

prog='
GIT_AUTHOR_EMAIL=${GIT_AUTHOR_EMAIL/@example.org/@users.sourceforge.net}
GIT_AUTHOR_EMAIL=${GIT_AUTHOR_EMAIL/trent@xxxxxxxxxx@}
GIT_AUTHOR_EMAIL=${GIT_AUTHOR_EMAIL/novalazy@xxxxxxxxxx}

GIT_COMMITTER_EMAIL=${GIT_COMMITTER_EMAIL/@example.org/@users.sourceforge.net}
GIT_COMMITTER_EMAIL=${GIT_COMMITTER_EMAIL/trent@xxxxxxxxxx@}
GIT_COMMITTER_EMAIL=${GIT_COMMITTER_EMAIL/novalazy@xxxxxxxxxx}

export GIT_AUTHOR_EMAIL
export GIT_COMMITTER_EMAIL
'

date
git filter-branch \
    --env-filter "$prog" \
    --tag-name-filter cat \
    -d /dev/shm/git$$ \
    -f -- --all
date