Patrick Steinhardt <ps@xxxxxx> writes: > test_must_fail git update-ref --stdin <commands 2>output.err && > - test_cmp expected-err output.err && > + grep "fatal:\( cannot lock ref $SQ$addname$SQ:\)\? $SQ$delref$SQ exists; cannot create $SQ$addref$SQ" output.err && OK, that's more thorough than I would have done (I am lazy and would just check "cannot create"), but being more specific is better than being lazy ;-) > @@ -191,69 +188,69 @@ test_expect_success 'one new ref is a simple prefix of another' ' > > ' > > -test_expect_success REFFILES 'D/F conflict prevents add long + delete short' ' > +test_expect_success 'D/F conflict prevents add long + delete short' ' > df_test refs/df-al-ds --add-del foo/bar foo > ' All the changes make sense here. Thanks.