Junio C Hamano <junkio@xxxxxxx> wrote: > Shawn Pearce <spearce@xxxxxxxxxxx> writes: > > >> > What about all of those memcpy(a, b, 20)'s? :-) > >> > >> Surely. If you are inclined to, go wild. > > > > Like this? :-) > > Except some minor nits, yes. > > * I would have preferred two patches, one for "master" and one > for the C merge-recursive topic (or at least "next"). Doh. I didn't realize this was something you were interested in pulling into master. Otherwise I would have done this. Next time I'll try to keep that in mind. > * You missed a few in "master". Not surprising since I typically work against and use next. > * The cast in the second hunk in combine-diff.c was wrong; > breakage was caught by our testsuite. OK, that's just flat out stupid of me. I apologize for making you fix my mistakes. :-) > I've pushed out a fixed up result in "master" and "next". Thanks. -- Shawn. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html