X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=ls-files.c;h=c6c32d94b0755550a97544708ce71885c02a4b68;hb=62bb99606d0377fc14f206cbdf95acb57149d87a;hp=3b93d5e7cc7f7dd4ebed13a5cc1a4ad976fc94d8;hpb=e99d59ff0bff349ef205cef1076e0354c8130680;p=git.git

diff --git a/ls-files.c b/ls-files.c
index 3b93d5e7..c6c32d94 100644
--- a/ls-files.c
+++ b/ls-files.c
@@ -136,7 +136,10 @@ static void read_directory(const char *path, const char *base, int baselen)
 		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;
@@ -259,7 +262,7 @@ static void show_files(void)
 				       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),