7 local gdr=${DGIT_GITDEBREBASE_TEST-git-debrebase}
9 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
10 $gdr $GDR_TEST_OPTS $GDR_TEST_DEBUG $t_gdr_xopts "$@"
11 : '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
15 t-gdr-same-as-before () {
17 git diff ${beforetag-t.before} -- ':.' ':!debian/patches'
20 t-gdr-branch-structure () {
22 # state should be one of
30 laundered) etype=Upstream ;;
31 stitched) etype=Pseudomerge ;;
32 pushed) etype=AddPatches; netype=Pseudomerge ;;
35 t-git-debrebase analyse >../anal.check
36 expect=`git rev-parse HEAD`
38 local cid ctype info nparents
39 while read cid ctype info; do
40 : ===== $cid $ctype $info =====
43 if [ "x$ctype" = "x$etype" ]; then cetype=SAME; fi
44 local parents="`git log -n1 --pretty=format:%P $cid`"
47 : "$ctype/$cetype" "$parents"
48 case "$ctype/$cetype" in
50 expect=${info#Contributor=}
53 git diff --quiet $expect..$cid
58 git diff --quiet $expect..$cid -- ':.' ':!debian'
59 git diff --quiet $expect..$cid -- ':debian/patches'
63 git diff --quiet $expect..$cid -- \
64 ':.' ':!debian/patches'
70 git diff --quiet $expect..$cid -- \
71 ':.' ':!debian/changelog'
75 git diff --quiet $expect..$cid -- ':debian'
77 BreakwaterUpstreamMerge/Upstream| \
78 BreakwaterUpstreamMerge/Packaging)
82 fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
86 local cnparents=`printf "%s" "$parents" | wc -w`
87 test $cnparents = $enparents
91 *) fail 'unexpected parent' ;;
100 echo >>debian/zorkmid "// debian $token"
101 git add debian/zorkmid
102 git commit -m "DEBIAN add zorkmid ($token)"
104 echo >>src.c "// upstream $token"
105 git commit -a -m "UPSTREAM edit src.c ($token)"
107 for f in debian/zorkmid src.c; do
108 echo "// both! $token" >>$f
111 git commit -m "MIXED add both ($token)"