Re: [PATCH v2 0/3] fix interactive rebase short SHA-1 collision bug

2013-08-26 Thread Junio C Hamano
Eric Sunshine writes: > ... when 'next' is ready to be rewound after 1.8.4 > is released, a replacement to the original series should be sent with > all the incremental patches squashed in. It was more like "could, if you want to help us keep clean history going forward", rather than "should" ;-

[PATCH v2 0/3] fix interactive rebase short SHA-1 collision bug

2013-08-23 Thread Eric Sunshine
This is a re-roll of [1] which fixes a short SHA-1 collision bug during rebase -i. v1 graduated to 'next' quickly, before I was able to post a re-roll addressing Junio's review comments, so I instead posted fixes as incremental patches atop 'next' [2]. Also, after already in 'next', I discovered an