Junio C Hamano <gitster@xxxxxxxxx> writes: > Simon Ruderich <simon@xxxxxxxxxxxx> writes: > >> All other error messages in the file use quotes around the file name. >> >> This change removes two translations as "could not write to '%s'" and >> "could not close '%s'" are already translated and these two are the only >> occurrences without quotes. >> >> Signed-off-by: Simon Ruderich <simon@xxxxxxxxxxxx> >> --- >> wrapper.c | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) > > This patch is incomplete without adjusting a handful of tests to > expect the updated messages, no? I'll squash these in while queuing, but there might be more that I didn't notice. Thansk. t/t3600-rm.sh | 2 +- t/t7001-mv.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh index f8568f8841..ab5500db44 100755 --- a/t/t3600-rm.sh +++ b/t/t3600-rm.sh @@ -688,7 +688,7 @@ test_expect_success 'checking out a commit after submodule removal needs manual git submodule update && git checkout -q HEAD^ && git checkout -q master 2>actual && - test_i18ngrep "^warning: unable to rmdir submod:" actual && + test_i18ngrep "^warning: unable to rmdir '\''submod'\'':" actual && git status -s submod >actual && echo "?? submod/" >expected && test_cmp expected actual && diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh index f5929c46f3..6e5031f56f 100755 --- a/t/t7001-mv.sh +++ b/t/t7001-mv.sh @@ -452,7 +452,7 @@ test_expect_success 'checking out a commit before submodule moved needs manual u git mv sub sub2 && git commit -m "moved sub to sub2" && git checkout -q HEAD^ 2>actual && - test_i18ngrep "^warning: unable to rmdir sub2:" actual && + test_i18ngrep "^warning: unable to rmdir '\''sub2'\'':" actual && git status -s sub2 >actual && echo "?? sub2/" >expected && test_cmp expected actual &&
