aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-29 13:47:51 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-29 13:47:51 -0700
commit2851e8eba52e98d3112417952a24d82ae9d8c0eb (patch)
treef3405fe2afe9542f5c64fbfe749fac76fb5000bf /t
parent2f76919517e98bb5e979d6c8c7bbc3478a066a21 (diff)
parent6df42ab98480dcac473ca7d701cfca4a0051d0c1 (diff)
downloadgit-2851e8eba52e98d3112417952a24d82ae9d8c0eb.tar.gz
git-2851e8eba52e98d3112417952a24d82ae9d8c0eb.tar.xz
Merge branch 'po/etc-gitattributes'
* po/etc-gitattributes: Add global and system-wide gitattributes Conflicts: Documentation/config.txt Makefile
Diffstat (limited to 't')
-rwxr-xr-xt/t0003-attributes.sh13
1 files changed, 13 insertions, 0 deletions
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index de38c7f7a..25205ac0e 100755
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -36,6 +36,9 @@ test_expect_success 'setup' '
echo "d/* test=a/b/d/*"
echo "d/yes notest"
) >a/b/.gitattributes
+ (
+ echo "global test=global"
+ ) >$HOME/global-gitattributes
'
@@ -57,6 +60,16 @@ test_expect_success 'attribute test' '
'
+test_expect_success 'core.attributesfile' '
+ attr_check global unspecified &&
+ git config core.attributesfile "$HOME/global-gitattributes" &&
+ attr_check global global &&
+ git config core.attributesfile "~/global-gitattributes" &&
+ attr_check global global &&
+ echo "global test=precedence" >> .gitattributes &&
+ attr_check global precedence
+'
+
test_expect_success 'attribute test: read paths from stdin' '
cat <<EOF > expect