t-dgit push --new
push_and_check () {
- git push $tmp/git/$p.git $1
+ git push $dgitrepo $1
- oldmaster=`cd $tmp/git/$p.git && t-git-get-ref refs/heads/master`
+ oldmaster=`cd $dgitrepo && t-git-get-ref refs/heads/master`
t-refs-same-start
- git checkout dgit/sid
+ git checkout master
t-commit 'Empty update'
t-dgit build
t-dgit push --new
- t-pushed-good dgit/sid
+ t-pushed-good master
}
t-check-master-undisturbed () {
- local master=`t-git-get-ref refs/heads/master`
+ local master; master=`t-git-get-ref refs/heads/master`
if [ x$master != x$oldmaster ]; then fail "bad update to master"; fi
}
git checkout -b divergent common-ancestor
git commit --allow-empty -m 'Has common ancestor'
-git push $tmp/git/$p.git HEAD:master
+git push $dgitrepo HEAD:master
push_and_check HEAD:master
push_and_check +HEAD:master
-echo done.
+t-ok