Merge branch 'hold/rpm'

diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index dbff346c0a45b2342d543802f57322b76f850cb4..fde2bb25fa0fb41c09b4e4c87de8b9d1c0f9c237 100755 (executable)
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -66,3 +66,17 @@ test_expect_success \
        --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