Re: [PATCH v2 00/24] object_id part 10

2017-10-12 Thread brian m. carlson
On Thu, Oct 12, 2017 at 06:58:49PM +0900, Junio C Hamano wrote: > "brian m. carlson" writes: > > > In the course of that, I'll rebase on top of master so that Junio can > > avoid as much conflict resolution as possible. > > I actually do not mind either way, but by rebasing on top of a more > re

Re: [PATCH v2 00/24] object_id part 10

2017-10-12 Thread Junio C Hamano
"brian m. carlson" writes: > In the course of that, I'll rebase on top of master so that Junio can > avoid as much conflict resolution as possible. I actually do not mind either way, but by rebasing on top of a more recent codebase you can lose a large part of 07/24 IIRC, which would be a big pl

Re: [PATCH v2 00/24] object_id part 10

2017-10-12 Thread brian m. carlson
On Wed, Oct 11, 2017 at 12:05:50PM +0200, Michael Haggerty wrote: > 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 change

Re: [PATCH v2 00/24] object_id part 10

2017-10-11 Thread Junio C Hamano
Michael Haggerty writes: > 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, bu

Re: [PATCH v2 00/24] object_id part 10

2017-10-11 Thread Michael Haggerty
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

Re: [PATCH v2 00/24] object_id part 10

2017-10-09 Thread Junio C Hamano
"brian m. carlson" writes: > 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 ha

Re: [PATCH v2 00/24] object_id part 10

2017-10-09 Thread Stefan Beller
On Sun, Oct 8, 2017 at 6:11 PM, 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