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

[PATCH 2/3] Support symlinks in git-ls-files --others.

Browse Source 
It is kind of surprising that this was missed in the last round,
but the work tree scanner in git-ls-files was still deliberately
ignoring symlinks.  This patch fixes it, so that --others will
correctly report unregistered symlinks.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Petr Baudis <pasky@ucw.cz>
This commit is contained in:
Junio C Hamano 2005-05-12 17:16:04 -07:00 committed by Petr Baudis
parent 1126b419d6
commit a15c1c60db
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cache.h
View File

@ -27,6 +27,7 @@
#define DT_UNKNOWN 0 #define DT_UNKNOWN 0
#define DT_DIR 1 #define DT_DIR 1
#define DT_REG 2 #define DT_REG 2
#define DT_LNK 3
#define DTYPE(de) DT_UNKNOWN #define DTYPE(de) DT_UNKNOWN
#endif #endif

8
ls-files.c
View File

@ -109,8 +109,9 @@ static void add_name(const char *pathname, int len)
/* /*
* Read a directory tree. We currently ignore anything but * Read a directory tree. We currently ignore anything but
* directories and regular files. That's because git doesn't * directories, regular files and symlinks. That's because git
* handle them at all yet. Maybe that will change some day. * doesn't handle them at all yet. Maybe that will change some
* day.
* *
* Also, we currently ignore all names starting with a dot. * Also, we currently ignore all names starting with a dot.
* That likely will not change. * That likely will not change.
@ -141,7 +142,7 @@ static void read_directory(const char *path, const char *base, int baselen)
case DT_UNKNOWN: case DT_UNKNOWN:
if (lstat(fullname, &st)) if (lstat(fullname, &st))
continue; continue;
if (S_ISREG(st.st_mode)) if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode))
break; break;
if (!S_ISDIR(st.st_mode)) if (!S_ISDIR(st.st_mode))
continue; continue;
@ -152,6 +153,7 @@ static void read_directory(const char *path, const char *base, int baselen)
baselen + len + 1); baselen + len + 1);
continue; continue;
case DT_REG: case DT_REG:
case DT_LNK:
break; break;
} }
add_name(fullname, baselen + len); add_name(fullname, baselen + len);