make: Entering directory `/var/tmp/portage/dev-util/git-1.5.2.5/work/git-1.5.2.5/t'
*** t3001-ls-files-others-exclude.sh ***
* expecting success: git-ls-files --others \
       --exclude=\*.6 \
       --exclude-per-directory=.gitignore \
       --exclude-from=.git/ignore \
       >output &&
     git diff expect output
diff --git a/expect b/output
index 64499ad..ad9b06d 100644
--- a/expect
+++ b/output
@@ -2,17 +2,14 @@ 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
* FAIL 1: git-ls-files --others with various exclude options.
	git-ls-files --others \
	       --exclude=\*.6 \
	       --exclude-per-directory=.gitignore \
	       --exclude-from=.git/ignore \
	       >output &&
	     git diff expect output

* expecting success: git-ls-files --others \
       --exclude=\*.6 \
       --exclude-per-directory=.gitignore \
       --exclude-from=.git/ignore \
       >output &&
     git diff expect output
diff --git a/expect b/output
index 64499ad..ad9b06d 100644
--- a/expect
+++ b/output
@@ -2,17 +2,14 @@ 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
* FAIL 2: git-ls-files --others with \r\n line endings.
	git-ls-files --others \
	       --exclude=\*.6 \
	       --exclude-per-directory=.gitignore \
	       --exclude-from=.git/ignore \
	       >output &&
	     git diff expect output

* expecting success: diff -u expect output
*   ok 3: git-status honours core.excludesfile

* failed 2 among 3 test(s)
make: Leaving directory `/var/tmp/portage/dev-util/git-1.5.2.5/work/git-1.5.2.5/t'