7 local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
9 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
10 $gdr $GDR_TEST_OPTS $GDR_TEST_DEBUG $t_gdr_xopts "$@"
11 : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
17 local beforetag=$2 # say HEAD to skip this check
18 # state should be one of
23 git diff --quiet ${beforetag-t.before} -- ':.' ':!debian/patches'
28 laundered) etype=Upstream ;;
29 stitched) etype=Pseudomerge ;;
30 pushed) etype=AddPatches; netype=Pseudomerge ;;
33 t-git-debrebase analyse >../anal.check
34 expect=`git rev-parse HEAD`
36 local cid ctype info nparents
37 while read cid ctype info; do
38 : ===== $cid $ctype $info =====
41 if [ "x$ctype" = "x$etype" ]; then cetype=SAME; fi
42 local parents="`git log -n1 --pretty=format:%P $cid`"
45 : "$ctype/$cetype" "$parents"
46 case "$ctype/$cetype" in
49 Packaging/Upstream) ;;
51 Changelog/Packaging) ;;
52 Changelog/Upstream) ;;
54 BreakwaterUpstreamMerge/Upstream) ;;
55 BreakwaterUpstreamMerge/Packaging) ;;
57 fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
63 expect=${info#Contributor=}
66 git diff --quiet $expect..$cid
70 git diff --quiet $expect..$cid -- ':.' ':!debian'
71 git diff --quiet $expect..$cid -- ':debian/patches'
75 git diff --quiet $expect..$cid -- \
76 ':.' ':!debian/patches'
81 git diff --quiet $expect..$cid -- \
82 ':.' ':!debian/changelog'
86 git diff --quiet $expect..$cid -- ':debian'
88 BreakwaterUpstreamMerge)
93 local cnparents=`printf "%s" "$parents" | wc -w`
94 test $cnparents = $enparents
98 *) fail 'unexpected parent' ;;
107 echo >>debian/zorkmid "// debian $token"
108 git add debian/zorkmid
109 git commit -m "DEBIAN add zorkmid ($token)"
111 echo >>src.c "// upstream $token"
112 git commit -a -m "UPSTREAM edit src.c ($token)"
114 for f in debian/zorkmid src.c; do
115 echo "// both! $token" >>$f
118 git commit -m "MIXED add both ($token)"
121 t-make-new-upstream-tarball () {
123 git checkout make-upstream
124 # leaves ust set to filename of orig tarball
125 echo "upstream $uv" >>docs/README
126 git commit -a -m "upstream $uv tarball"
127 ust=example_$uv.orig.tar.gz
128 git archive -o ../$ust --prefix=example-2.0/ make-upstream