undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dir.c: Omit non-excluded directories with dir->show_ignored

Browse Source 
This makes "git-ls-files --others --directory --ignored" behave
as documented and consequently also fixes "git-clean -d -X".
Previously, git-clean would remove non-excluded directories
even when using the -X option.

Signed-off-by: Michael Spang <mspang@uwaterloo.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Michael Spang 2007-05-06 22:35:04 -04:00 committed by Junio C Hamano
parent 070739fd35
commit b991625611
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dir.c
View File

@ -448,6 +448,7 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
while ((de = readdir(fdir)) != NULL) { while ((de = readdir(fdir)) != NULL) {
int len; int len;
int exclude;
if ((de->d_name[0] == '.') && if ((de->d_name[0] == '.') &&
(de->d_name[1] == 0 || (de->d_name[1] == 0 ||
@ -461,7 +462,9 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
memcpy(fullname + baselen, de->d_name, len+1); memcpy(fullname + baselen, de->d_name, len+1);
if (simplify_away(fullname, baselen + len, simplify)) if (simplify_away(fullname, baselen + len, simplify))
continue; continue;
if (excluded(dir, fullname) != dir->show_ignored) {
exclude = excluded(dir, fullname);
if (exclude != dir->show_ignored) {
if (!dir->show_ignored || DTYPE(de) != DT_DIR) { if (!dir->show_ignored || DTYPE(de) != DT_DIR) {
continue; continue;
} }
@ -484,6 +487,8 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
len++; len++;
switch (treat_directory(dir, fullname, baselen + len, simplify)) { switch (treat_directory(dir, fullname, baselen + len, simplify)) {
case show_directory: case show_directory:
if (exclude != dir->show_ignored)
continue;
break; break;
case recurse_into_directory: case recurse_into_directory:
contents += read_directory_recursive(dir, contents += read_directory_recursive(dir,