mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 18:33:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

dir: warn about trailing spaces in exclude patterns

Browse Source 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2014-02-09 07:26:37 +07:00 committed by Junio C Hamano
parent 3330a2c4f6
commit 16402b992e
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dir.c
View File

@ -463,6 +463,22 @@ void clear_exclude_list(struct exclude_list *el)
el->filebuf = NULL;
}
static void check_trailing_spaces(const char *fname, char *buf)
{
int i, last_space = -1, len = strlen(buf);
for (i = 0; i < len; i++)
if (buf[i] == '\\')
i++;
else if (buf[i] == ' ')
last_space = i;
else
last_space = -1;
if (last_space == len - 1)
warning(_("%s: trailing spaces in '%s'. Please quote or remove them."),
fname, buf);
}
int add_excludes_from_file_to_list(const char *fname,
const char *base,
int baselen,
@ -514,6 +530,7 @@ int add_excludes_from_file_to_list(const char *fname,
if (buf[i] == '\n') {
if (entry != buf + i && entry[0] != '#') {
buf[i - (i && buf[i-1] == '\r')] = 0;
check_trailing_spaces(fname, entry);
add_exclude(entry, base, baselen, el, lineno);
}
lineno++;

31
t/t0008-ignores.sh
View File

@ -775,4 +775,35 @@ test_expect_success PIPE 'streaming support for --stdin' '
echo "$response" | grep "^:: two"
'
############################################################################
#
# test whitespace handling
test_expect_success 'trailing whitespace is warned' '
mkdir whitespace &&
>whitespace/trailing &&
>whitespace/untracked &&
echo "whitespace/trailing " >ignore &&
cat >expect <<EOF &&
whitespace/trailing
whitespace/untracked
EOF
git ls-files -o -X ignore whitespace >actual 2>err &&
grep "ignore:.*'\''whitespace/trailing '\''" err &&
test_cmp expect actual
'
test_expect_success 'quoting allows trailing whitespace' '
rm -rf whitespace &&
mkdir whitespace &&
>"whitespace/trailing " &&
>whitespace/untracked &&
echo "whitespace/trailing\\ \\ " >ignore &&
echo whitespace/untracked >expect &&
: >err.expect &&
git ls-files -o -X ignore whitespace >actual 2>err &&
test_cmp expect actual &&
test_cmp err.expect err
'
test_done