On Tue, Oct 13, 2015 at 01:43:30PM +0200, Michael Haggerty wrote: > On 10/09/2015 03:43 AM, brian m. carlson wrote: > > Convert several internal functions in refs.c to use struct object_id, > > and use the GIT_SHA1_HEXSZ constants in parse_ref_line. > > > > Signed-off-by: brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> > > [...] > > I looked over this patch at the diff level and didn't find any problems. > > This patch conflicts heavily with [1]. But I noticed that it is > independent of the rest of your series. I don't know when either patch > series will be ready, but see [2] for my take on the other one. > > Assuming neither series is rejected, I think it would be much easier to > redo this patch on top of the first part of [1] than vice versa, so that > would be my suggestion. If it comes down to that, I am willing to help > redo this patch if you like. I'll take a look at it over the next couple of days. I'll probably drop it from this series and either see if it can be put on top of the other one, or defer it to a future series. That way we can minimize conflicts. -- brian m. carlson / brian with sandals: Houston, Texas, US +1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187
Attachment:
signature.asc
Description: PGP signature