Junio C Hamano <gitster@xxxxxxxxx> writes: > Arnaud Lacombe <lacombar@xxxxxxxxx> writes: > >> This commit introduces a regression when editing splithunks using "git >> add -p". Reverting the patch fix the regression. > > Thanks for a report. I don't have a time to look at this now; help from > "add -p" people would be appreciated. > > I have a suspicion that the symptom may be a bug in "add -p" exposed by > the change; "add -p" which used to count the patch lines carefully itself, > but was modified to use 'apply --recount' in more recent versions. Sorry, not that one, but what "add -p" used to carefully do but punts these days is to combine adjacent hunks correctly. I suspect that laziness is coming back and haunt us, and if that is the case, we should fix it there, and should not work it around by breaking the normal patch application codepath. -- 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