Re: [PATCH 2/3] dir.c: Omit non-excluded directories with dir->show_ignored
- From
- Michael Spang <mspang@uwaterloo.ca>
- Date
- May 7, 2007, 02:35 UTC
- Message-ID
- <463E9058.5080907@uwaterloo.ca>
- In-Reply-To
- <alpine.LFD.0.98.0705061239460.25245@woody.linux-foundation.org>
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> ---
This fixes the style issue noted by Linus.
dir.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/dir.c b/dir.c index d306352..11fab7f 100644 --- a/dir.c +++ b/dir.c @@ -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,