Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-tag: Do not assume the working tree root is writable.
[gitweb.git]
/
ls-files.c
diff --git
a/ls-files.c
b/ls-files.c
index 3085b2fc8c7e8920ecca8e9c0657d6124b0fbfda..d9c8b215f1dcc48ebd7de9f92713f43a09a80e66 100644
(file)
--- 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;