X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgitattributes;h=04fcbcbdef025ae538ba6f309b2c38006110c481;hb=6049408ca3970df8fbef951cc00f6cdb2c6ea9c5;hp=2e24bba3ab7adfdaf33290fba28740cdd80d2f63;hpb=aacc377731b9fd2a635808b65462a93810759e4d;p=dgit.git diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes index 2e24bba3..04fcbcbd 100755 --- a/tests/tests/gitattributes +++ b/tests/tests/gitattributes @@ -3,6 +3,7 @@ set -e . tests/lib t-dependencies bsdgames +t-dependencies man-db git-man t-tstunt-parsechangelog t-archive-none example @@ -56,6 +57,15 @@ badattr export-subst badattr delta badattr encoding no-such-encoding +man gitattributes \ +| perl -ne 'print $1,"\n" if m/^ *(\w[-a-z]*)$/' \ +> grepped-attrs + +exec sums # ----- common to source formats ----- @@ -97,13 +107,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 @@ -121,7 +132,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 @@ -157,7 +168,7 @@ diff_convert () { :; } sfmt_setup 1.1 diff sfmt_import norm -: ----- test "3.0 (quilt)" +: ----- test "3.0 (quilt)" ----- quilt_addpatch () { pname=$1