git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Andrew Arnott" <andrewarnott@gmail.com>
To: "Samuel Tardieu" <sam@rfc1149.net>
Cc: git@vger.kernel.org
Subject: Re: How to rewrite author history
Date: Sat, 22 Mar 2008 06:11:12 -0700	[thread overview]
Message-ID: <216e54900803220611v5aa5e9d5q86da249480be3c91@mail.gmail.com> (raw)
In-Reply-To: <2008-03-22-10-29-23+trackit+sam@rfc1149.net>

Thanks.  Re-importing from SVN isn't an option any more, but I ended
up with something like this that seems to have worked.

git checkout master
git-filter-branch --env-filter '
if [ "$GIT_AUTHOR_NAME" = "andrewarnott" ];
then
export GIT_AUTHOR_EMAIL="andrewarnott@gmail.com"
export GIT_AUTHOR_NAME="Andrew Arnott"
fi
export GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL
export GIT_COMMITTER_NAME=$GIT_AUTHOR_NAME
'

And I did this for master, and my v1 and v0.1 branches.  I'm concerned
though, that since I changed the names of all the objects by doing
this, did I somehow make my branches incompatible with each other?
Will there be any problems in the future sharing commits or merging
across branches as a result?

Thanks.

On Sat, Mar 22, 2008 at 2:29 AM, Samuel Tardieu <sam@rfc1149.net> wrote:
> >>>>> "Andrew" == Andrew Arnott <andrewarnott@gmail.com> writes:
>
>  Andrew> I imported my git repo from an SVN repo, and the authors have
>  Andrew> email@SOME-GUID for their email address rather than their
>  Andrew> actual one (probably courtesy of Google Code hosting).
>  Andrew> Rewriting history and changing all the commit hashes isn't a
>  Andrew> problem at this point in development, so how can I do a
>  Andrew> massive search-and-replace to replace several specific author
>  Andrew> emails with the valid ones?
>
>  If you can reimport it, you can use the "--authors-file" of "git svn".
>
>   Sam
>
>



-- 
Andrew Arnott

  reply	other threads:[~2008-03-22 13:11 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <216e54900803210938q4981b5d1t535af419f5b15ad8@mail.gmail.com>
2008-03-21 16:41 ` How to rewrite author history Andrew Arnott
2008-03-21 18:40   ` Dmitry Potapov
2008-03-22  9:29   ` Samuel Tardieu
2008-03-22 13:11     ` Andrew Arnott [this message]
2008-03-22 16:57       ` Jeff King
2008-03-22 19:06         ` Andrew Arnott
2008-03-23  7:09           ` Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=216e54900803220611v5aa5e9d5q86da249480be3c91@mail.gmail.com \
    --to=andrewarnott@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=sam@rfc1149.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).