mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'pb/trim-trailing-spaces' into maint
* pb/trim-trailing-spaces: t0008: do not depend on 'echo' handling backslashes specially dir.c:trim_trailing_spaces(): fix for " \ " sequence
This commit is contained in:
commit
cbf4e024ad
32
dir.c
32
dir.c
|
@ -508,21 +508,25 @@ void clear_exclude_list(struct exclude_list *el)
|
|||
|
||||
static void trim_trailing_spaces(char *buf)
|
||||
{
|
||||
int i, last_space = -1, nr_spaces, len = strlen(buf);
|
||||
for (i = 0; i < len; i++)
|
||||
if (buf[i] == '\\')
|
||||
i++;
|
||||
else if (buf[i] == ' ') {
|
||||
if (last_space == -1) {
|
||||
last_space = i;
|
||||
nr_spaces = 1;
|
||||
} else
|
||||
nr_spaces++;
|
||||
} else
|
||||
last_space = -1;
|
||||
char *p, *last_space = NULL;
|
||||
|
||||
if (last_space != -1 && last_space + nr_spaces == len)
|
||||
buf[last_space] = '\0';
|
||||
for (p = buf; *p; p++)
|
||||
switch (*p) {
|
||||
case ' ':
|
||||
if (!last_space)
|
||||
last_space = p;
|
||||
break;
|
||||
case '\\':
|
||||
p++;
|
||||
if (!*p)
|
||||
return;
|
||||
/* fallthrough */
|
||||
default:
|
||||
last_space = NULL;
|
||||
}
|
||||
|
||||
if (last_space)
|
||||
*last_space = '\0';
|
||||
}
|
||||
|
||||
int add_excludes_from_file_to_list(const char *fname,
|
||||
|
|
|
@ -806,4 +806,29 @@ test_expect_success !MINGW 'quoting allows trailing whitespace' '
|
|||
test_cmp err.expect err
|
||||
'
|
||||
|
||||
test_expect_success NOT_MINGW,NOT_CYGWIN 'correct handling of backslashes' '
|
||||
rm -rf whitespace &&
|
||||
mkdir whitespace &&
|
||||
>"whitespace/trailing 1 " &&
|
||||
>"whitespace/trailing 2 \\\\" &&
|
||||
>"whitespace/trailing 3 \\\\" &&
|
||||
>"whitespace/trailing 4 \\ " &&
|
||||
>"whitespace/trailing 5 \\ \\ " &&
|
||||
>"whitespace/trailing 6 \\a\\" &&
|
||||
>whitespace/untracked &&
|
||||
sed -e "s/Z$//" >ignore <<-\EOF &&
|
||||
whitespace/trailing 1 \ Z
|
||||
whitespace/trailing 2 \\\\Z
|
||||
whitespace/trailing 3 \\\\ Z
|
||||
whitespace/trailing 4 \\\ Z
|
||||
whitespace/trailing 5 \\ \\\ Z
|
||||
whitespace/trailing 6 \\a\\Z
|
||||
EOF
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue