proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-22 18:37:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug in diff untracked dir scan

Browse Source 
When scanning untracked directories looking for non-ignored files
there was a bug where an empty directory would generate a false
error.
This commit is contained in:
Russell Belfer 2013-06-20 11:37:58 -07:00
parent 8b2fa181b2
commit 852ded9698
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/diff.c
View File

@ -786,10 +786,15 @@ static int diff_scan_inside_untracked_dir(
/* need to recurse into non-ignored directories */ /* need to recurse into non-ignored directories */
if (!is_ignored && S_ISDIR(info->nitem->mode)) { if (!is_ignored && S_ISDIR(info->nitem->mode)) {
if ((error = git_iterator_advance_into( error = git_iterator_advance_into(&info->nitem, info->new_iter);
&info->nitem, info->new_iter)) < 0)
break; if (!error)
continue; continue;
else if (error == GIT_ENOTFOUND) {
error = 0;
is_ignored = true; /* treat empty as ignored */
} else
break; /* real error, must stop */
} }
/* found a non-ignored item - treat parent dir as untracked */ /* found a non-ignored item - treat parent dir as untracked */