diff options
Diffstat (limited to 'ls-files.c')
| -rw-r--r-- | ls-files.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ls-files.c b/ls-files.c index 3085b2fc8c..d9c8b215f1 100644 --- a/ls-files.c +++ b/ls-files.c @@ -97,7 +97,7 @@ static int add_excludes_from_file_1(const char *fname, for (i = 0; i < size; i++) { if (buf[i] == '\n') { if (entry != buf + i && entry[0] != '#') { - buf[i] = 0; + buf[i - (i && buf[i-1] == '\r')] = 0; add_exclude(entry, base, baselen, which); } entry = buf + i + 1; |