Horton

Re: git: uh-oh

Michael Haggerty <mhagger@alum.mit.edu>

View thread
From: Michael Haggerty <mhagger@alum.mit.edu>
To: Alvaro Herrera <alvherre@commandprompt.com>
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-19T03:44:07Z
Lists: pgsql-hackers 
Alvaro Herrera wrote:
> 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.

No, all SHA1s refer to the values for the *old* versions of the commits.

Michael