enparents=1
: "$ctype/$cetype" "$parents"
case "$ctype/$cetype" in
- Pseudomerge/SAME)
+ Pseudomerge/SAME) ;;
+ Packaging/SAME) ;;
+ Packaging/Upstream) ;;
+ AddPatches/SAME) ;;
+ Changelog/Packaging) ;;
+ Changelog/Upstream) ;;
+ Upstream/SAME) ;;
+ BreakwaterUpstreamMerge/Upstream) ;;
+ BreakwaterUpstreamMerge/Packaging) ;;
+ *)
+ fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
+ ;;
+ esac
+
+ case "$ctype" in
+ Pseudomerge)
expect=${info#Contributor=}
expect=${expect%% *}
enparents=2
git diff --quiet $expect..$cid
etype=Upstream
;;
- Packaging/SAME|\
- Packaging/Upstream)
+ Packaging)
git diff --quiet $expect..$cid -- ':.' ':!debian'
git diff --quiet $expect..$cid -- ':debian/patches'
etype=Packaging
;;
- AddPatches/SAME)
+ AddPatches)
git diff --quiet $expect..$cid -- \
':.' ':!debian/patches'
etype=$netype
netype=Upstream
;;
- Changelog/Packaging|\
- Changelog/Upstream)
+ Changelog)
git diff --quiet $expect..$cid -- \
':.' ':!debian/changelog'
etype=Packaging
Upstream/SAME)
git diff --quiet $expect..$cid -- ':debian'
;;
- BreakwaterUpstreamMerge/Upstream| \
- BreakwaterUpstreamMerge/Packaging)
+ BreakwaterUpstreamMerge)
break
;;
- *)
- fail "etype=$etype ctype=$ctype cetype=$cetype $cid"
- ;;
esac
local cnparents=`printf "%s" "$parents" | wc -w`