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

Merge branch 'jc/ls-files-o'

Browse Source 
* jc/ls-files-o:
  ls-files: honour per-directory ignore file from higher directories.
This commit is contained in:
Junio C Hamano 2006-02-09 00:21:27 -08:00
commit 9a9d58520d
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ls-files.c
View File

@ -490,8 +490,28 @@ static void show_files(void)
const char *path = ".", *base = ""; const char *path = ".", *base = "";
int baselen = prefix_len; int baselen = prefix_len;
if (baselen) if (baselen) {
path = base = prefix; path = base = prefix;
if (exclude_per_dir) {
char *p, *pp = xmalloc(baselen+1);
memcpy(pp, prefix, baselen+1);
p = pp;
while (1) {
char save = *p;
*p = 0;
push_exclude_per_directory(pp, p-pp);
*p++ = save;
if (!save)
break;
p = strchr(p, '/');
if (p)
p++;
else
p = pp + baselen;
}
free(pp);
}
}
read_directory(path, base, baselen); read_directory(path, base, baselen);
qsort(dir, nr_dir, sizeof(struct nond_on_fs *), cmp_name); qsort(dir, nr_dir, sizeof(struct nond_on_fs *), cmp_name);
if (show_others) if (show_others)