test suite: gitattributes: Call t-git-none

[dgit.git] / tests / tests / gitattributes

diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes
index 0f71c335b8657c957a92cea4627483874f8020da..286395d6b5e7fd968b334a556580d8300c1abe84 100755 (executable)
--- a/tests/tests/gitattributes
+++ b/tests/tests/gitattributes
@@ -7,6 +7,7 @@ t-dependencies man-db git-man
 t-tstunt-parsechangelog
 
 t-archive-none example
+t-git-none
 bv=1.0
 t-worktree $bv
 
@@ -107,13 +108,14 @@ sfmt_import () {
        dgitargs=$2
        refname="import.$sfmt-$inst"
        brkerr=stderr.$sfmt-$inst.broken
+       dscf=${p}_${v}.dsc
 
        mkdir $pdb-import-$inst
        cd $pdb-import-$inst
        git init
 
        LC_MESSAGES=C \
-       t-dgit $dgitargs import-dsc ../${p}_${v}.dsc +$refname.broken \
+       t-dgit $dgitargs import-dsc ../$dscf +$refname.broken \
                2>&1 |tee ../$brkerr
        fgrep 'warning: source tree contains .gitattributes' ../$brkerr
        git checkout $refname.broken
@@ -131,7 +133,7 @@ sfmt_import () {
 
        t-dgit setup-new-tree
 
-       t-dgit $dgitargs import-dsc ../${p}_${v}.dsc +$refname
+       t-dgit $dgitargs import-dsc ../$dscf +$refname
        git checkout $refname
 
        sums=sums.$sfmt-$inst
@@ -149,7 +151,9 @@ sfmt_import () {
 
 : ----- generate the orig -----
 
-tar --exclude=debian --exclude=.git -zcf ${p}_${bv}.orig.tar.gz $p
+origtar=${p}_${bv}.orig.tar.gz
+
+tar --exclude=debian --exclude=.git -zcf $origtar $p
 
 : ----- test 1.0 native -----
 
@@ -167,7 +171,7 @@ diff_convert () { :; }
 sfmt_setup 1.1 diff
 sfmt_import norm
 
-: ----- test "3.0 (quilt)"
+: ----- test "3.0 (quilt)" -----
 
 quilt_addpatch () {
        pname=$1