Re: [PATCH 00/12] object_id part 9
- From
Stefan Beller <sbeller@google.com>
- Date
- Jul 5, 2017, 18:02 UTC
- Message-ID
- <CAGZ79kbb33=BtspboOTXiPJtOYqFtS3pwNgqnggJv6Kn9uyPVw@mail.gmail.com>
- In-Reply-To
- <xmqqeftvjzgk.fsf@gitster.mtv.corp.google.com>
On Tue, Jul 4, 2017 at 9:10 PM, Junio C Hamano <gitster@pobox.com> wrote:
Show 13 quoted lines
> "brian m. carlson" <sandals@crustytoothpaste.net> 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