for dir in . one one/two three
do
mkdir -p $dir &&
- for i in 1 2 3 4 5
+ for i in 1 2 3 4 5 6 7 8
do
>$dir/a.$i
done
a.2
a.4
a.5
+a.8
one/a.3
one/a.4
one/a.5
+one/a.7
+one/two/a.2
one/two/a.3
one/two/a.5
+one/two/a.7
+one/two/a.8
three/a.2
three/a.3
three/a.4
three/a.5
+three/a.8
EOF
echo '.gitignore
output
expect
.gitignore
-' >.git/ignore
+*.7
+!*.8' >.git/ignore
echo '*.1
-/*.3' >.gitignore
+/*.3
+!*.6' >.gitignore
echo '*.2
-two/*.4' >one/.gitignore
+two/*.4
+!*.7
+*.8' >one/.gitignore
+echo '!*.2
+!*.8' >one/two/.gitignore
test_expect_success \
- 'git-ls-files --others --exclude.' \
+ 'git-ls-files --others with various exclude options.' \
'git-ls-files --others \
+ --exclude=\*.6 \
--exclude-per-directory=.gitignore \
--exclude-from=.git/ignore \
>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