On 05/11/2015 09:37 PM, Junio C Hamano wrote: > Michael Haggerty <mhagger@xxxxxxxxxxxx> writes: > >> +test_update_rejected () { >> + prefix="$1" && >> + before="$2" && >> + pack="$3" && >> + create="$4" && >> + error="$5" && >> + printf "create $prefix/%s $C\n" $before | >> + git update-ref --stdin && >> + git for-each-ref $prefix >unchanged && >> + if $pack >> + then >> + git pack-refs --all >> + fi && >> + printf "create $prefix/%s $C\n" $create >input && >> + test_must_fail git update-ref --stdin <input 2>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? Regarding "grep -F", what would be a better alternative, given that I want to test that the conflict is being reported correctly? Michael -- Michael Haggerty mhagger@xxxxxxxxxxxx -- 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