On Tue, Jul 4, 2017 at 9:10 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > "brian m. carlson" <sandals@xxxxxxxxxxxxxxxxxxxx> writes: > >> It is possible there will be some other conflicts with in flight topics, >> as get_sha1 is commonly used in the codebase. This is unavoidable to >> some extent, but should be kept in mind. My experience is that usually >> the required changes for conversion are minimal. > > Thanks. > > It did have a few conflicts in submodule area and sequencer, but > they were (hopefully) trivial to resolve. The result is queued at > the tip of 'pu'. It seems to pass the tests locally and also at > Travis. The series as queued (modulo 2 minor nits/questions asked in patch 11/12) as well as the conflict resolution look good to me. Thanks, Stefan
