projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send-email: use built-in time() instead of /bin/date '+%s'
[git.git]
/
ls-files.c
diff --git
a/ls-files.c
b/ls-files.c
index
c533059
..
e42119c
100644
(file)
--- a/
ls-files.c
+++ b/
ls-files.c
@@
-92,11
+92,12
@@
static int add_excludes_from_file_1(const char *fname,
close(fd);
return 0;
}
close(fd);
return 0;
}
- buf = xmalloc(size);
+ buf = xmalloc(size
+1
);
if (read(fd, buf, size) != size)
goto err;
close(fd);
if (read(fd, buf, size) != size)
goto err;
close(fd);
+ buf[size++] = '\n';
entry = buf;
for (i = 0; i < size; i++) {
if (buf[i] == '\n') {
entry = buf;
for (i = 0; i < size; i++) {
if (buf[i] == '\n') {
@@
-279,8
+280,11
@@
static void read_directory(const char *path, const char *base, int baselen)
continue;
len = strlen(de->d_name);
memcpy(fullname + baselen, de->d_name, len+1);
continue;
len = strlen(de->d_name);
memcpy(fullname + baselen, de->d_name, len+1);
- if (excluded(fullname) != show_ignored)
- continue;
+ if (excluded(fullname) != show_ignored) {
+ if (!show_ignored || DTYPE(de) != DT_DIR) {
+ continue;
+ }
+ }
switch (DTYPE(de)) {
struct stat st;
switch (DTYPE(de)) {
struct stat st;
@@
-778,6
+782,7
@@
int main(int argc, const char **argv)
continue;
error("pathspec '%s' did not match any.",
pathspec[num] + prefix_offset);
continue;
error("pathspec '%s' did not match any.",
pathspec[num] + prefix_offset);
+ errors++;
}
return errors ? 1 : 0;
}
}
return errors ? 1 : 0;
}