X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgitattributes;h=416206b21e4ff3bb08ebafbc2f212a74d4a2db26;hb=663d79cdcc8fe536350c05fc681b445502be4cfe;hp=52a2e058ab87ebe3101cac5300e3811bf5694e84;hpb=376bac56f8eb4d081c630ef08585165a1860ec0c;p=dgit.git

diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes
index 52a2e058..416206b2 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,12 +248,12 @@ 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 ..
 
-t-dgit clone $p sid $p.clone
+t-dgit-warn-check 1 clone $p sid $p.clone
 
 cd $p.clone
 sums=sums.clone
@@ -253,4 +262,4 @@ sums_check
 
 cd ..
 
-#t-ok
+t-ok