summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-05-22 01:42:35 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-22 01:42:35 (GMT)
commitf95c6780c244e90abf87222126ad3b4bb18a504e (patch)
treeede18dbb8b33e330f3837209a489f7737df2dc25 /t
parent7df6ddf51ea71d81874ecfa34f670f50a3d45103 (diff)
parent0ba956d331e4c14fb1600a62044492c6c27af71a (diff)
downloadgit-f95c6780c244e90abf87222126ad3b4bb18a504e.zip
git-f95c6780c244e90abf87222126ad3b4bb18a504e.tar.gz
git-f95c6780c244e90abf87222126ad3b4bb18a504e.tar.bz2
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1: git-status: respect core.excludesFile SubmittingPatches: mention older C compiler compatibility git-daemon: don't ignore pid-file write failure
Diffstat (limited to 't')
-rwxr-xr-xt/t3001-ls-files-others-exclude.sh20
1 files changed, 20 insertions, 0 deletions
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index db7a847..fcfcfbb 100755
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -79,4 +79,24 @@ test_expect_success \
>output &&
git diff expect output'
+cat > excludes-file << EOF
+*.[1-8]
+e*
+EOF
+
+git-config core.excludesFile excludes-file
+
+git-runstatus | grep "^# " > output
+
+cat > expect << EOF
+# .gitignore
+# a.6
+# one/
+# output
+# three/
+EOF
+
+test_expect_success 'git-status honours core.excludesfile' \
+ 'diff -u expect output'
+
test_done