On 10/09/2017 03:11 AM, brian m. carlson wrote: > This is the tenth in a series of patches to convert from unsigned char > [20] to struct object_id. This series mostly involves changes to the > refs code. After these changes, there are almost no references to > unsigned char in the main refs code. > > The series has not been rebased on master since the last submission, but > I can do so if that's more convenient. > > This series is available from the following URL: > https://github.com/bk2204/git.git object-id-part10 I read through the whole series medium-thoroughly and left a few comments, but overall it looks very good and clear. Thanks so much for working on this! I took a stab at rebasing this patch series on top of current master using `git-imerge`. I pushed the results to my GitHub fork [1] as branch `object-id-part-10-rebased`. I didn't check the results very carefully, nor whether the commit messages need adjusting, but I did verify that each of the commits passes the test suite. Junio, it might serve as something to compare against your conflict resolution. Michael [1] https://github.com/mhagger/git
