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>
#define DT_UNKNOWN 0
#define DT_DIR 1
#define DT_REG 2
#define DT_UNKNOWN 0
#define DT_DIR 1
#define DT_REG 2
#define DTYPE(de) DT_UNKNOWN
#endif
#define DTYPE(de) DT_UNKNOWN
#endif
/*
* 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
- * handle them at all yet. Maybe that will change some day.
+ * directories, regular files and symlinks. That's because git
+ * doesn't handle them at all yet. Maybe that will change some
+ * day.
*
* Also, we currently ignore all names starting with a dot.
* That likely will not change.
*
* Also, we currently ignore all names starting with a dot.
* That likely will not change.
case DT_UNKNOWN:
if (lstat(fullname, &st))
continue;
case DT_UNKNOWN:
if (lstat(fullname, &st))
continue;
- if (S_ISREG(st.st_mode))
+ if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode))
break;
if (!S_ISDIR(st.st_mode))
continue;
break;
if (!S_ISDIR(st.st_mode))
continue;
baselen + len + 1);
continue;
case DT_REG:
baselen + len + 1);
continue;
case DT_REG:
break;
}
add_name(fullname, baselen + len);
break;
}
add_name(fullname, baselen + len);