mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-02 00:06:11 +02:00
Code

Merge branch 'sr/wrapper-quote-filenames' 

Some error messages did not quote filenames shown in it, which have
been fixed.

* sr/wrapper-quote-filenames:
  wrapper.c: consistently quote filenames in error messages
This commit is contained in:
Junio C Hamano 2017-11-15 12:14:29 +09:00
parent f116163171 0a288d1ee9
commit 61f68f6073
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
t/t3600-rm.sh
View File

@ -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 &&

2
t/t7001-mv.sh
View File

@ -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 &&

8
wrapper.c
View File

@ -569,7 +569,7 @@ static int warn_if_unremovable(const char *op, const char *file, int rc)
if (!rc || errno == ENOENT)
return 0;
err = errno;
warning_errno("unable to %s %s", op, file);
warning_errno("unable to %s '%s'", op, file);
errno = err;
return rc;
}
@ -583,7 +583,7 @@ int unlink_or_msg(const char *file, struct strbuf *err)
if (!rc || errno == ENOENT)
return 0;
strbuf_addf(err, "unable to unlink %s: %s",
strbuf_addf(err, "unable to unlink '%s': %s",
file, strerror(errno));
return -1;
}
@ -653,9 +653,9 @@ void write_file_buf(const char *path, const char *buf, size_t len)
{
int fd = xopen(path, O_WRONLY | O_CREAT | O_TRUNC, 0666);
if (write_in_full(fd, buf, len) < 0)
die_errno(_("could not write to %s"), path);
die_errno(_("could not write to '%s'"), path);
if (close(fd))
die_errno(_("could not close %s"), path);
die_errno(_("could not close '%s'"), path);
}
void write_file(const char *path, const char *fmt, ...)