mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-19 07:49:11 +02:00
Code

remove CR/LF from .gitignore 

For everyone cursed by dos/windows line endings (aka CRLF):

The code reading the .gitignore files (excludes and excludes per
directory) leaves \r in the patterns, which causes fnmatch to fail for
no obvious reason. Just remove a "\r" preceding a "\n"
unconditionally.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Alex Riesen 2005-11-02 14:05:45 +01:00 committed by Junio C Hamano
parent 13d1cc3604
commit d317e4384a
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ls-files.c
View File

@ -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;

12
t/t3001-ls-files-others-exclude.sh
View File

@ -67,4 +67,16 @@ test_expect_success \
>output &&
diff -u expect output'
# Test \r\n (MSDOS-like systems)
echo -ne '*.1\r\n/*.3\r\n!*.6\r\n' >.gitignore
test_expect_success \
'git-ls-files --others with \r\n line endings.' \
'git-ls-files --others \
--exclude=\*.6 \
--exclude-per-directory=.gitignore \
--exclude-from=.git/ignore \
>output &&
diff -u expect output'
test_done