On 10/05/18 15:11, Oliver Joseph Ash wrote: > You found the problem Phillip! My editor was trimming trailing white space, > which breaks the context line.
I'm glad we found the source of the problem (and that it wasn't some obscure bug) > I had tried to use an alternative editor to account for any editor specific > behaviour, but it turns out both the editors I tested in were doing this! > > I suspect this change in behaviour will effect a lot of users? If so, it > would be good if `git add -p` allowed for this behaviour, in the same way > `git apply` does. Yes, I think it probably makes sense to do that. Originally I didn't count empty lines as context lines in case the user accidentally added some empty lines at the end of the hunk but if 'git apply' does then I think 'git add -p' should as well > Meanwhile, I can easily configure my editor not to do this for `*.diff` files. > > Thanks for your help, Phillip and Martin! Thanks for posting an example so we could test it, it makes it much easier to track the problem down Best Wishes Phillip > Mahmoud, does this also explain your problem as per your original post? >
