diff options
| author |  Michael Spang <mspang@uwaterloo.ca> | 2007-05-06 22:35:04 -0400 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-05-07 15:29:29 -0700 |
| commit | b991625611da1cba39c6ac50d0329e5d5ce5d0ab (patch) | |
| tree | acf35ab82313684801e68d7a03e933ecf3a34ffc | |
| parent | Merge branch 'master' of git://repo.or.cz/git-gui (diff) | |
| download | tgif-b991625611da1cba39c6ac50d0329e5d5ce5d0ab.tar.xz | |
dir.c: Omit non-excluded directories with dir->show_ignored
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>
| -rw-r--r-- | dir.c | 7 |
1 files changed, 6 insertions, 1 deletions
@@ -448,6 +448,7 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co while ((de = readdir(fdir)) != NULL) { int len; + int exclude; if ((de->d_name[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); if (simplify_away(fullname, baselen + len, simplify)) 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) { continue; } @@ -484,6 +487,8 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co len++; switch (treat_directory(dir, fullname, baselen + len, simplify)) { case show_directory: + if (exclude != dir->show_ignored) + continue; break; case recurse_into_directory: contents += read_directory_recursive(dir, |