X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=ls-files.c;h=dfe1481a353cb216e6967c172fe3426b76e4cedf;hb=fad60083853bcf46717b577257b4227a30b72679;hp=89941a3ff8baa023840c092f2b6964cb2b33cce4;hpb=453ec4bdf403c2e89892266a0a660c21680d3f9d;p=git.git diff --git a/ls-files.c b/ls-files.c index 89941a3ff..dfe1481a3 100644 --- a/ls-files.c +++ b/ls-files.c @@ -215,28 +215,8 @@ static void show_files(struct dir_struct *dir) const char *path = ".", *base = ""; int baselen = prefix_len; - if (baselen) { + if (baselen) path = base = prefix; - if (dir->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(dir, pp, p-pp); - *p++ = save; - if (!save) - break; - p = strchr(p, '/'); - if (p) - p++; - else - p = pp + baselen; - } - free(pp); - } - } read_directory(dir, path, base, baselen); if (show_others) show_other_files(dir);