[PATCH 2/2] dir: ignore trailing spaces in exclude patterns
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
Documentation/gitignore.txt | 3 +++
dir.c | 4 +---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index b08d34d..8734c15 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -77,6 +77,9 @@ PATTERN FORMAT
Put a backslash ("`\`") in front of the first hash for patterns
that begin with a hash.
+ - Trailing spaces are ignored unless they are quoted with backlash
+ ("`\`").
+
- An optional prefix "`!`" which negates the pattern; any
matching file excluded by a previous pattern will become
included again. It is not possible to re-include a file if a parent
diff --git a/dir.c b/dir.c
index 9edde44..7dee5ca 100644
--- a/dir.c
+++ b/dir.c
@@ -496,9 +496,7 @@ static void check_trailing_spaces(const char *fname, char *buf)
int len = strlen(buf);
while (len && buf[len - 1] == ' ')
len--;
- if (buf[len] != '\0')
- warning(_("%s: trailing spaces in '%s'. Please quote them."),
- fname, buf);
+ buf[len] = '\0';
}
int add_excludes_from_file_to_list(const char *fname,
--
1.8.5.2.240.g8478abd
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>