X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Funrepresentable;h=e4b0da85a4e2fcb5c686697687ef210640ba063b;hb=d436b26183c219a8633f84aa39cf991fd8b6de4d;hp=0d02c6aac9dc6c0cd30439a8539d2e75385f20b3;hpb=6dbc82e06ae1e6840dfa2ef2cc6b496561e6f333;p=dgit.git diff --git a/tests/tests/unrepresentable b/tests/tests/unrepresentable index 0d02c6aa..e4b0da85 100755 --- a/tests/tests/unrepresentable +++ b/tests/tests/unrepresentable @@ -4,14 +4,19 @@ set -e t-tstunt-parsechangelog -t-prep-newpackage example 1.0 +t-prep-newpackage example 1.1 ln -s $troot/pkg-srcs/${p}_${v%-*}.orig.tar.* . cd $p -start () { git checkout quilt-tip~0; } +start () { git checkout quilt-tip-1.1~0; } attempt () { t-dgit -wgf --quilt=smash quilt-fixup; } +good () { + attempt + t-dgit --quilt=nofix -wgf build-source + t-dgit -wgf --dry-run push --new +} badly-1 () { wrongfn=$1 @@ -25,28 +30,38 @@ badly-2 () { attempt } -badly-1 symlink 'not a plain file' - ln -s TARGET symlink - git add symlink +badly-1 orig-symlink 'modified symlink' + ln -sf NEWTARGET orig-symlink + git add orig-symlink +badly-2 + +badly-1 orig-symlink 'deletion of symlink' + git rm -f orig-symlink badly-2 start git rm src.c git commit -m deleted -attempt +good + +start + git rm orig-exec + git rm -f orig-unwriteable + git commit -m 'deleted funny' +good -badly-1 src.c 'mode changed' +badly-1 src.c 'mode or type changed' chmod +x src.c git add src.c badly-2 -badly-1 new 'non-default mode' +badly-1 new 'creation with non-default mode' echo hi >new chmod 755 new git add new badly-2 start -attempt +good t-ok