mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dir.c: stop ignoring opendir() error in open_cached_dir()

Browse Source 
A follow-up to the recently fixed bugs in the untracked
invalidation. If opendir() fails it should show a warning, perhaps
this should die, but if this ever happens the error is probably
recoverable for the user, and dying would just make things worse.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2018-01-24 16:30:23 +07:00
committed by Junio C Hamano
parent b640313110
commit b673155074
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dir.c
View File

@ -1787,11 +1787,16 @@ static int open_cached_dir(struct cached_dir *cdir,
struct strbuf *path, struct strbuf *path,
int check_only) int check_only)
{ {
const char *c_path;
memset(cdir, 0, sizeof(*cdir)); memset(cdir, 0, sizeof(*cdir));
cdir->untracked = untracked; cdir->untracked = untracked;
if (valid_cached_dir(dir, untracked, istate, path, check_only)) if (valid_cached_dir(dir, untracked, istate, path, check_only))
return 0; return 0;
cdir->fdir = opendir(path->len ? path->buf : "."); c_path = path->len ? path->buf : ".";
cdir->fdir = opendir(c_path);
if (!cdir->fdir)
warning_errno(_("could not open directory '%s'"), c_path);
if (dir->untracked) { if (dir->untracked) {
invalidate_directory(dir->untracked, untracked); invalidate_directory(dir->untracked, untracked);
dir->untracked->dir_opened++; dir->untracked->dir_opened++;