Ensure that git_index_add_all handles ignored directories
#6521
Conversation
src/libgit2/index.c
Outdated
| @@ -3453,6 +3453,13 @@ static int apply_each_file(const git_diff_delta *delta, float progress, void *pa | |||
| &match, NULL)) | |||
| return 0; | |||
|
|
|||
| /* | |||
| * diff returns the directory when all files are ignored; we never | |||
There was a problem hiding this comment.
Is this behavior of diff intentional?
Filtering out trees in function named apply_each_file looks ... weird.
|
Unfortunately this does not work as intended. At the time |
Ensure that when all files beneath a directory are ignored that we actually ignore the files.
Ensure that when all files beneath a directory are ignored that we add the files when FORCE is specified.
When the contents of an entire new directory is ignored, and `FORCE` is specified to `git_index_add_all`, ensure that we expand the entire file list. By default, diff will coalesce a fully ignored folder into a single diff entry; expand it.
ethomson
force-pushed
the
ethomson/weird_ignore
branch
from
7d78ca3
to
129cadf
Compare
Ah, yes, thanks. I had it flipped around in my head. In any case, the problem here is that diff coalesces a folder that has contents that are all ignored into a single diff entry. We need to expand that out to add files to the index. This update should do that. |
|
@ethomson the latest version works for us. |
When all files beneath a directory are ignored, our diff machinery will return the directory itself. Obviously we do not operate on directories in the index, so
git_index_add_allshould ignore this case.Fixes #6517