X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgitattributes;h=0b361ada3d99310fec167eaef90c2531d85758cb;hb=0de90d6589a4e11bdae9a6f8f1bab65156ea7c19;hp=9e1c246a476cf400c95b76af163663ef1c5938ca;hpb=10971841444e359f4ca8d490822c390cc7bca890;p=dgit.git

diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes
index 9e1c246a..0b361ada 100755
--- a/tests/tests/gitattributes
+++ b/tests/tests/gitattributes
@@ -22,12 +22,20 @@ badattr1 () {
 	printf >>af/$filename 'crlf: \r\n'
 	echo >>af/$filename 'id $Id: $'
 	echo >>af/$filename 'id $Id: SPLARK $'
+	printf >>af/$filename '\xEF\xBB\xBF <- UTF-8 BOM\n'
 	echo >>gitattrs "af/$filename" "$attrspec"
 }
 
 badattr () {
 	attrname=$1; shift
-	badattr1 $attrname-set $attrname
+
+	case "$attrname" in
+	working-tree-encoding) ;;
+	*)
+		badattr1 $attrname-set $attrname
+		;;
+	esac
+
 	badattr1 $attrname-unset -$attrname
 	badattr1 $attrname-unspec \!$attrname
 	local val
@@ -57,6 +65,7 @@ badattr export-ignore
 badattr export-subst
 badattr delta
 badattr encoding no-such-encoding
+badattr working-tree-encoding ISO-8859-1 UTF-16
 
 man gitattributes \
 | perl -ne 'print $1,"\n" if m/^ *(\w[-a-z]*)$/' \
@@ -239,7 +248,7 @@ t-dgit-warn-check 0 -cdgit.default.setup-gitattributes=false \
 	clone $p sid $p.clone.broken
 cd $p.clone.broken
 
-sums=$p.clone.broken
+sums=sums.broken
 sums_check_broken
 
 cd ..
@@ -253,4 +262,24 @@ sums_check
 
 cd ..
 
+t-dgit-warn-check 0 -cdgit.default.setup-gitattributes=false \
+	clone $p sid $p.clone.old
+
+cd $p.clone.old
+
+mkdir -p .git/info
+cat >.git/info/attributes <<'END'
+*       dgit-defuse-attrs
+[attr]dgit-defuse-attrs -text -eol -crlf -ident -filter
+# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)
+END
+
+t-dgit setup-gitattributes
+git reset --hard
+
+sums=sums.old
+sums_check
+
+cd ..
+
 t-ok