diff --git a/ls-files.c b/ls-files.c
index 76782f691956ba2562b4757e08d6e7fa626dd3ea..c6c32d94b0755550a97544708ce71885c02a4b68 100644 (file)
--- a/ls-files.c
+++ b/ls-files.c
while ((de = readdir(dir)) != NULL) {
int len;
- if (de->d_name[0] == '.')
+ if ((de->d_name[0] == '.') &&
+ (de->d_name[1] == 0 ||
+ !strcmp(de->d_name + 1, ".") ||
+ !strcmp(de->d_name + 1, "git")))
continue;
if (excluded(de->d_name) != show_ignored)
continue;
e2->name, e2->len);
}
-static void show_killed_files()
+static void show_killed_files(void)
{
int i;
for (i = 0; i < nr_dir; i++) {
tag_cached,
ce->name, line_terminator);
else
- printf("%s%06o %s %d %s%c",
+ printf("%s%06o %s %d\t%s%c",
ce_stage(ce) ? tag_unmerged :
tag_cached,
ntohl(ce->ce_mode),
}
static const char *ls_files_usage =
- "ls-files [-z] [-t] (--[cached|deleted|others|stage|unmerged|killed])* "
+ "git-ls-files [-z] [-t] (--[cached|deleted|others|stage|unmerged|killed])* "
"[ --ignored [--exclude=<pattern>] [--exclude-from=<file>) ]";
int main(int argc, char **argv)