@matheusbsbs / matheus-bagliano / commits / 9e082734b3
Fork 0

Revert "excluded_1(): support exclude files in index"

This reverts commit c84de70781674a35b9bfd20aa5bc8c47582615df. The commit provided a workaround for matching directories in index. But it is no longer needed. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Nguyễn Thái Ngọc Duy committed Nov 27, 2010 at 01:17 UTC 9e082734b3a7c2685c1593dae8dca1e73568d51c
1 file changed -7
dir.c
-7
@@ -371,13 +371,6 @@ int excluded_from_list(const char *pathname,
371 int to_exclude = x->to_exclude;
372
373 if (x->flags & EXC_FLAG_MUSTBEDIR) {
374 - if (!dtype) {
375 - if (!prefixcmp(pathname, exclude) &&
376 - pathname[x->patternlen] == '/')
377 - return to_exclude;
378 - else
379 - continue;
380 - }
374 if (*dtype == DT_UNKNOWN)
375 *dtype = get_dtype(NULL, pathname, pathlen);
376 if (*dtype != DT_DIR)