X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fgitattributes;h=9e1c246a476cf400c95b76af163663ef1c5938ca;hb=98f0b776adea78bc0f4c379a8e956a3cb69046ae;hp=83fa6102ef430f7ecc2a3899fac68e6ddeef484a;hpb=005625309ea693fcb6e95b595c2395a9c533dd3d;p=dgit.git diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes index 83fa6102..9e1c246a 100755 --- a/tests/tests/gitattributes +++ b/tests/tests/gitattributes @@ -149,7 +149,7 @@ t-dgit-warn-check () { LC_MESSAGES=C t-dgit "$@" 2>&1 |tee ../$err set +e - fgrep 'warning: source tree contains .gitattributes' ../$err + egrep 'warning: .* contains \.gitattributes' ../$err rc=$? set -e @@ -178,6 +178,7 @@ sfmt_import () { t-dgit-warn-check 1 $dgitargs import-dsc ../$dscf +$branch git checkout $branch + touch af/* git reset --hard sums_check @@ -229,4 +230,27 @@ sfmt_setup 1.0-1 quilt sfmt_import norm sfmt_import absurd --force-import-gitapply-absurd -#t-ok +: ----- 'test clone (with "3.0 (quilt)")' ----- + +mv $origtar ${dscf%.dsc}.* $tmp/mirror/pool/main/ +t-archive-query sid + +t-dgit-warn-check 0 -cdgit.default.setup-gitattributes=false \ + clone $p sid $p.clone.broken +cd $p.clone.broken + +sums=$p.clone.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-ok