aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-06-14 11:48:59 -0700
committerJunio C Hamano <gitster@pobox.com>2008-06-14 11:48:59 -0700
commitb994ec142f296c7118823495764151c2a6227e1a (patch)
tree83d90b6f53b8446e85415e6d645d9a13c97864dd /t
parentc8c6a2ecb48d717fe2735bf7790226021380d520 (diff)
parent2d35d556e27cd3e7f3d2eea04a7f0d7ee8513f8e (diff)
downloadgit-b994ec142f296c7118823495764151c2a6227e1a.tar.gz
git-b994ec142f296c7118823495764151c2a6227e1a.tar.xz
Merge branch 'rs/attr'
* rs/attr: Ignore .gitattributes in bare repositories
Diffstat (limited to 't')
-rwxr-xr-xt/t0003-attributes.sh35
1 files changed, 35 insertions, 0 deletions
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index c56d2fbab..3d8e06a20 100755
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -54,4 +54,39 @@ test_expect_success 'root subdir attribute test' '
'
+test_expect_success 'setup bare' '
+
+ git clone --bare . bare.git &&
+ cd bare.git
+
+'
+
+test_expect_success 'bare repository: check that .gitattribute is ignored' '
+
+ (
+ echo "f test=f"
+ echo "a/i test=a/i"
+ ) >.gitattributes &&
+ attr_check f unspecified &&
+ attr_check a/f unspecified &&
+ attr_check a/c/f unspecified &&
+ attr_check a/i unspecified &&
+ attr_check subdir/a/i unspecified
+
+'
+
+test_expect_success 'bare repository: test info/attributes' '
+
+ (
+ echo "f test=f"
+ echo "a/i test=a/i"
+ ) >info/attributes &&
+ attr_check f f &&
+ attr_check a/f f &&
+ attr_check a/c/f f &&
+ attr_check a/i a/i &&
+ attr_check subdir/a/i unspecified
+
+'
+
test_done