When the destination is a branch, specify refs/heads/ explicitly.
This makes ap-push work even if the ref does not yet exist on the
destination.
There is no functional change for an existing installation pushing to
an existing branch. But for a hypothetical new installation, this
would be necessary.
And, more relevantly, when new "branches" are invented, the use of an
existing ap-push case as a template will generate a new case which
creates the branch as is necessary.
I leave the more complex osstest case alone. It's not clear to me
whether the destination ref not existing is an installation problem of
such severity that indeed ap-push should fail.
Signed-off-by: Ian Jackson <ian.jack...@eu.citrix.com>
Acked-by: Ian Campbell <ian.campb...@citrix.com>
---
ap-push | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/ap-push b/ap-push
index 5967b42..1dd5b05 100755
--- a/ap-push
+++ b/ap-push
@@ -52,14 +52,14 @@ xen-3.*)
;;
xen-unstable)
cd $repos/xen
- git push $TREE_XEN $revision:master
+ git push $TREE_XEN $revision:refs/heads/master
;;
xen-*-testing)
cd $repos/xen
xenversion=$branch
xenversion=${branch%-testing}
xenversion=${xenversion#xen-}
- git push $TREE_XEN $revision:stable-$xenversion
+ git push $TREE_XEN $revision:refs/heads/stable-$xenversion
;;
qemu-mainline)
cd $repos/qemu-mainline
@@ -67,11 +67,11 @@ qemu-mainline)
;;
qemu-upstream-*)
cd $repos/$branch
- git push $TREE_QEMU_UPSTREAM $revision:master
+ git push $TREE_QEMU_UPSTREAM $revision:refs/heads/master
;;
linux-3.*)
cd $repos/linux
- git push $TREE_LINUX $revision:tested/$branch
+ git push $TREE_LINUX $revision:refs/heads/tested/$branch
;;
linux-2.6.39)
cd $repos/linux
@@ -83,11 +83,11 @@ linux-xen-*)
;;
libvirt)
cd $repos/libvirt
- git push $TREE_LIBVIRT $revision:xen-tested-master
+ git push $TREE_LIBVIRT $revision:refs/heads/xen-tested-master
;;
rumpuserxen)
cd $repos/rumpuserxen
- git push $TREE_RUMPUSERXEN $revision:xen-tested-master
+ git push $TREE_RUMPUSERXEN $revision:refs/heads/xen-tested-master
;;
seabios)
cd $repos/seabios
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
