From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 14 Jan 2017 23:26:44 +0000 (+0000)
Subject: FOR BUG
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=refs%2Fheads%2Ffor-dpkg-source.2017-01-14;p=dgit.git

FOR BUG
---

diff --git a/debian/tests/control b/debian/tests/control
index 2ba41838..5563a80c 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -11,6 +11,10 @@ Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential
 Restrictions: x-dgit-intree-only x-dgit-git-only
 
+Tests: gitattributes
+Tests-Directory: tests/tests
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, bsdgames
+
 Tests: defdistro-mirror mirror mirror-debnewgit mirror-private
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, rsync
diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes
index 05841182..873534f5 100755
--- a/tests/tests/gitattributes
+++ b/tests/tests/gitattributes
@@ -5,14 +5,24 @@ set -e
 t-dependencies bsdgames
 
 t-archive-none example
-t-worktree 1.0
+v=1.0
+t-worktree $v
 
 cd $p
 
-mkdir af
+: ----- convert to "3.0 (quilt)"
+
+tar --exclude=debian -C .. -zcf ../${p}_${v}.orig.tar.gz $p
+dch -v 1.0-1 -m convert
+mkdir -p debian/source
+echo '3.0 (quilt)' >debian/source/format
+
+v=1.0-1
 
 : ----- make everything break -----
 
+mkdir af
+
 badattr1 () {
 	local filename=$1
 	local attrspec=$2
@@ -21,6 +31,9 @@ badattr1 () {
 	echo >>af/$filename 'id $Id: $'
 	echo >>af/$filename 'id $Id: SPLARK $'
 	echo >>.gitattributes "af/$filename" "$attrspec"
+	EDITOR=true VISUAL=true dpkg-source --commit
+	false
+	#"add $filename"
 }
 
 badattr () {
@@ -60,7 +73,7 @@ sha256sum af/* >sums
 
 dpkg-source -b .
 
-t-dgit import-dsc ../${p}_1.0.dsc +import
+t-dgit import-dsc ../${p}_${v}.dsc +import
 
 for f in af/*; do
 	git cat-file blob "import:$f" | sha256sum | \