5 t-tstunt-parsechangelog
9 # Easiest way to make a patches-unapplied but not-gbp tree is
10 # to take the patches-unapplied tree and by-hand commit the .gitignore
11 # changes as a debian patch.
18 t-dgit "$@" --quilt=$qmode build-source
22 t-dgit "$@" --quilt=$qmode push
27 echo "===== testing tree suitable for --quilt=gbp (only) ====="
29 t-expect-fail 'grep: new-upstream-file: No such file or directory' \
30 t-dgit --quilt=dpm build-source
32 t-expect-fail 'git tree differs from result of applying' \
33 t-dgit -wgf --quilt=dpm build-source
35 t-expect-fail 'git tree differs from orig in upstream files' \
36 t-dgit -wgf --quilt=unapplied build-source
38 t-expect-fail 'This might be a patches-unapplied branch' \
39 t-dgit -wgf build-source
41 # testing success with --quilt=gbp are done in quilt-gbp test case
44 echo "===== making tree suitable for --quilt=unapplied (only) ====="
46 pf=debian/patches/test-gitignore
49 From: Senatus <spqr@example.com>
50 Subject: Add .gitignore
55 git-diff /dev/null .gitignore >>$pf || test $? = 1
56 echo ${pf##*/} >>debian/patches/series
58 git add debian/patches
60 git commit -m 'Turn gitignore into a debian patch'
61 gitigncommit=`git rev-parse HEAD`
63 t-commit unapplied 1.0-3
65 echo "----- testing tree suitable for --quilt=unapplied (only) -----"
67 t-expect-fail 'git tree differs from result of applying' \
68 t-dgit -wgf --quilt=dpm build-source
70 t-expect-fail 'gitignores: but, such patches exist' \
71 t-dgit -wgf --quilt=gbp build-source
73 t-expect-fail 'This might be a patches-unapplied branch' \
74 t-dgit -wgf build-source
76 want-success unapplied -wgf
79 echo "===== making fully-applied tree suitable for --quilt-check ====="
82 git merge --ff-only dgit/dgit/sid
84 t-commit vanilla 1.0-4
86 echo "----- testing fully-applied tree suitable for --quilt-check -----"
88 t-expect-fail 'gitignores: but, such patches exist' \
89 t-dgit --quilt=dpm build-source
91 t-expect-fail 'git tree differs from orig in upstream files' \
92 t-dgit --quilt=gbp build-source
94 t-expect-fail 'git tree differs from orig in upstream files' \
95 t-dgit --quilt=unapplied build-source
97 t-dgit --quilt=nofix build-source
100 t-dgit --quilt=nofix push
104 echo "===== making tree suitable for --quilt=dpm (only) ====="
107 git merge --ff-only dgit/dgit/sid
109 git revert --no-edit $gitigncommit
111 t-commit dpmish 1.0-5
113 echo "----- testing tree suitable for --quilt=dpm (only) -----"
115 t-expect-fail 'git tree differs from orig in upstream files' \
116 t-dgit -wgf --quilt=gbp build-source
118 t-expect-fail 'git tree differs from orig in upstream files' \
119 t-dgit -wgf --quilt=unapplied build-source
121 t-expect-fail 'This might be a patches-applied branch' \
122 t-dgit -wgf build-source