On Mon, Feb 12, 2018 at 04:03:49PM +0100, Alexander Shopov wrote: > @Jeff: > > we may want to avoid this anti-pattern > Current state of these tests is wrong and I should rework them. > > Here is what I intend to do: > 1. Fix the commit message > 2. Check whether I can get the tests in t0002-gitfile.sh to the > standard `test_i18ngrep !` negative (i.e. without using `if`) > 3. Post and ask for feedback again See the patch I posted earlier. For (2), "test_i18ngrep !" would be the wrong thing. I think you should either: - keep your patch as-is, and let Junio resolve the conflict when the two are merged - rebase your patch on top of mine. That's slightly less work for Junio, but it means that your topic cannot graduate until mine does (though hopefully mine is pretty non-controversial). I'd probably just do the first in your place, since the conflict is easy to resolve. -Peff