Re: git: uh-oh - Mailing list pgsql-hackers

From Michael Haggerty
Subject Re: git: uh-oh
Date
Msg-id 4C6CA887.4050505@alum.mit.edu
Whole thread Raw
In response to Re: git: uh-oh  (Alvaro Herrera <alvherre@commandprompt.com>)
List 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


pgsql-hackers by date:

Previous
From: KaiGai Kohei
Date:
Subject: Re: security label support, part.2
Next
From: Robert Haas
Date:
Subject: Re: CommitFest 2009-07: Yay, Kevin! Thanks, reviewers!