From: Michael Haggerty Date: Wed, 13 May 2015 20:19:44 GMT Subject: Re: [PATCH v2 01/18] t1404: new tests of ref D/F conflicts within transactions Message-ID: <5553B1E0.9080008@alum.mit.edu> In-Reply-To: On 05/12/2015 05:45 PM, Junio C Hamano wrote: > On Tue, May 12, 2015 at 1:32 AM, Michael Haggerty wrote: >> On 05/11/2015 09:37 PM, Junio C Hamano wrote: >>> Michael Haggerty writes: >>> ... >>>> + test_must_fail git update-ref --stdin output.err && >>>> + grep -F "$error" output.err && >>> >>> I am not 100% confident that "grep -F" is the right thing to use >>> here. I checked all the error message these tests are expecting and >>> none seems to go through _(), but is it fundamental that these >>> errors should not be translated? >> >> Aren't tests run in the "C" locale so that tests don't have to worry >> about i18n? > > But there is a i18n markings test, for which test-i18ngrep was invented for. Thanks for the info. I wasn't aware of that facility. So if I understand correctly, s/grep/test_i18ngrep/ will address your concern? That's fine with me. Meanwhile, I realized that verify_lock() also writes errors directly to stderr rather than storing them to a strbuf. I have a few patches that fix this [1], which would thematically fit well on the end of this patch series. But maybe this patch series is too big already? In any case I'll be away for a 4-day weekend so it will have to wait until Monday. Michael [1] They are available as branch "verify-lock-strbuf-err" on https://github.com/mhagger/git -- Michael Haggerty mhagger@alum.mit.edu