tar xf $troot/worktrees/${p}_$1.tar
}
+t-git () {
+ p=$1
+ v=$2
+ mkdir -p $tmp/git
+ (set -e; cd $tmp/git; tar xf $troot/git-srcs/${p}_$v.git.tar)
+}
+
t-git-none () {
mkdir -p $tmp/git
(set -e; cd $tmp/git; tar xf $troot/git-template.tar)
}
t-has-ancestor () {
- local ancestor=`git rev-parse $1`
local now=`git rev-parse HEAD`
+ local ancestor=`git rev-parse $1^{}`
local mbase=`git merge-base $ancestor $now`
if [ x$mbase != x$ancestor ]; then
echo "not ff $ancestor..$now, $mbase != $ancestor"
done
}
+t-v-tag () {
+ echo refs/tags/debian/${v//\~/_}
+}
+
t-pushed-good () {
+ local branch=$1
t-ref-dsc-dgit
t-refs-same-more \
- refs/heads/master \
- refs/tags/debian/$v \
+ refs/heads/$branch \
+ `t-v-tag` \
refs/remotes/dgit/dgit/sid
t-refs-notexist \
refs/heads/dgit/unstable \
(set -e; cd $tmp/git/$p.git
t-refs-same-more \
refs/dgit/sid \
- refs/tags/debian/$v
+ `t-v-tag`
t-refs-notexist \
refs/dgit/unstable
)
+ git verify-tag `t-v-tag`
}
t-ref-dsc-dgit () {