From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 20 Jun 2018 12:18:19 +0000 (+0100)
Subject: test suite: gitattributes: Do not try to set working-tree-encoding to true
X-Git-Tag: archive/debian/5.1~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=61016923b2a47b0550e36ed5f5a929d401811b42

test suite: gitattributes: Do not try to set working-tree-encoding to true

Part of the fix to #901900.  This suppresses the sort-of-spurious test
failure which occurs because the working-tree-encoding attribute is
discovered and then set to an inappropriate value.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes
index 5be7d01d..04c6b870 100755
--- a/tests/tests/gitattributes
+++ b/tests/tests/gitattributes
@@ -28,7 +28,14 @@ badattr1 () {
 
 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