Horton

Re: git: uh-oh

Alvaro Herrera <alvherre@commandprompt.com>

View thread
From: Alvaro Herrera <alvherre@commandprompt.com>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: Martijn van Oosterhout <kleptog@svana.org>, Tom Lane <tgl@sss.pgh.pa.us>, Magnus Hagander <magnus@hagander.net>, Robert Haas <robertmhaas@gmail.com>, pgsql-hackers <pgsql-hackers@postgresql.org>
Date: 2010-08-18T16:36:42Z
Lists: pgsql-hackers 
Excerpts from Michael Haggerty's message of mié ago 18 12:00:44 -0400 2010:

> 3. Run
> 
>     git filter-branch
> 
> This rewrites the commits using any parentage changes from the grafts
> file.  This changes most commits' SHA1 hashes.  After this you can
> discard the .git/info/grafts file.  You would then want to remove the
> original references, which were moved to "refs/original".

Hmm.  If I need to do two changes in the same branch, do I need to
mention the new SHA1 for the second one (after filter-branch changes its
SHA1), or the original one?  If the former, then this is going to be a
very painful process.

-- 
Álvaro Herrera <alvherre@commandprompt.com>
The PostgreSQL Company - Command Prompt, Inc.
PostgreSQL Replication, Consulting, Custom Development, 24x7 support