t-has-ancestor () {
# t-has-ancestor ANCESTOR
# (CHILD is implicit, HEAD)
t-has-ancestor () {
# t-has-ancestor ANCESTOR
# (CHILD is implicit, HEAD)
- local now=`git rev-parse HEAD`
- local ancestor=`git rev-parse $1^{}`
- local mbase=`t-git-merge-base $ancestor $now`
+ local now; now=`git rev-parse HEAD`
+ local ancestor; ancestor=`git rev-parse $1^{}`
+ local mbase; mbase=`t-git-merge-base $ancestor $now`
if [ x$mbase != x$ancestor ]; then
fail "not ff $ancestor..$now, $mbase != $ancestor"
fi
if [ x$mbase != x$ancestor ]; then
fail "not ff $ancestor..$now, $mbase != $ancestor"
fi
if [ x$master = x$t_ref_val ]; then return; fi
if [ x$master = x ]; then fail "failed to push master"; fi
# didn't update master, it must be not FF
if [ x$master = x$t_ref_val ]; then return; fi
if [ x$master = x ]; then fail "failed to push master"; fi
# didn't update master, it must be not FF
perl -e '$_=shift @ARGV; die "Dgit $_ ?" unless m/^\w+\b/;' "$val"
t-ref-same-val $incoming_dsc "$val"
}
perl -e '$_=shift @ARGV; die "Dgit $_ ?" unless m/^\w+\b/;' "$val"
t-ref-same-val $incoming_dsc "$val"
}