projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-resolve-script: use "git-apply --stat" instead of diffstat
[git.git]
/
ls-files.c
diff --git
a/ls-files.c
b/ls-files.c
index
3b93d5e
..
c6c32d9
100644
(file)
--- 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;
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;
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
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),
ce_stage(ce) ? tag_unmerged :
tag_cached,
ntohl(ce->ce_mode),