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

Merge branch 'jc/diff-no-index-with-pathspec-fix'

Browse Source 
Recent code added a direct access to the d_type member in "struct
dirent", but some platforms lack it, which has been corrected.

* jc/diff-no-index-with-pathspec-fix:
  diff-no-index: do not reference .d_type member of struct dirent
This commit is contained in:
Junio C Hamano
2025-06-25 14:07:36 -07:00
parent 4c9a5d7729 d094e05ea5
commit 567dc419b2
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
diff-no-index.c
View File

@@ -41,12 +41,24 @@ static int read_directory_contents(const char *path, struct string_list *list,
while ((e = readdir_skip_dot_and_dotdot(dir))) {
if (pathspec) {
int is_dir = 0;
strbuf_setlen(&match, len);
strbuf_addstr(&match, e->d_name);
if (NOT_CONSTANT(DTYPE(e)) != DT_UNKNOWN) {
is_dir = (DTYPE(e) == DT_DIR);
} else {
struct strbuf pathbuf = STRBUF_INIT;
strbuf_addstr(&pathbuf, path);
strbuf_complete(&pathbuf, '/');
is_dir = get_dtype(e, &pathbuf, 0) == DT_DIR;
strbuf_release(&pathbuf);
}
if (!match_leading_pathspec(NULL, pathspec,
match.buf, match.len,
0, NULL, e->d_type == DT_DIR ? 1 : 0))
0, NULL, is_dir))
continue;
}