X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fgitattributes;h=9ebc2161c83bb600f4eaf2a5156d4a4a159469b6;hp=682b459d9111f9b1c67585305c5ae35b64135102;hb=cc245dcf0eda3ff55a3b1f2cabffd06d2c503eea;hpb=38d5af284706d0f51e1b9e7bdfd9fea3aa0fa5c1

diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes
index 682b459d..9ebc2161 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
@@ -36,10 +44,13 @@ badattr () {
 	done
 }
 
-# xxx want to make each of these files into a quilt patch
+# todo: want to make each of these files into a quilt patch
 
 t-git-config core.eol crlf
 
+printf >>.dotfile-attr 'dotfiles too?\n'
+echo >>gitattrs '.dotfile-attr filter=dgit-test-crazy-f'
+
 badattr	text auto
 badattr eol lf crlf
 badattr ident
@@ -57,6 +68,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]*)$/' \
@@ -67,7 +79,7 @@ while read attr; do
 	badattr $attr
 done
 
-sha256sum af/* >sums
+sha256sum .dotfile-attr af/* >sums
 
 # ----- common to source formats -----
 
@@ -92,7 +104,7 @@ sfmt_setup () {
 	cp ../gitattrs .gitattributes
 	$addpatch gitattrs
 
-	cp -a ../af .
+	cp -a ../af ../.dotfile-attr .
 	$addpatch files
 
 	cp ../sums .
@@ -108,10 +120,10 @@ sums_check () {
 	#   $sums  $branch
 	# and check out $branch
 
-	sha256sum af/* >../$sums.checkout
+	sha256sum .dotfile-attr af/* >../$sums.checkout
 	diff -U0 ../sums ../$sums.checkout
 
-	for f in af/*; do
+	for f in .dotfile-attr af/*; do
 		git cat-file blob "refs/heads/$branch:$f" \
 			| sha256sum \
 			| sed -e 's#-$#'$f'#' \
@@ -126,7 +138,7 @@ sums_check_broken () {
 	#   $sums
 	# and check out the broken branch
 
-	sha256sum af/* >../$sums.broken
+	sha256sum .dotfile-attr af/* >../$sums.broken
 
 	for s in ../sums ../$sums.broken; do
 		sed 's/[0-9a-f]* //' $s >$s.nosums
@@ -178,6 +190,7 @@ sfmt_import () {
 
 	t-dgit-warn-check 1 $dgitargs import-dsc ../$dscf +$branch
 	git checkout $branch
+	touch .dotfile-attr af/*
 	git reset --hard
 
 	sums_check
@@ -238,6 +251,38 @@ t-dgit-warn-check 0 -cdgit.default.setup-gitattributes=false \
 	clone $p sid $p.clone.broken
 cd $p.clone.broken
 
+sums=sums.broken
+sums_check_broken
+
+cd ..
+
+t-dgit-warn-check 1 clone $p sid $p.clone
+
+cd $p.clone
+sums=sums.clone
+branch=dgit/sid
+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
+t-ok