Re: [PATCH OSSTEST] Switch to merged qemu-xen{, -traditional}.git trees

[Ian Campbell <ian.campbell@citrix.com>]

On Thu, 2015-09-17 at 11:43 +0100, Ian Campbell wrote:
> > > +qemu-upstream-*-testing)
> > ...
> > > +	# For now also push to the old split trees for historical
> > > +	# branches only (qemu-upstream started with xen-4.2-testing
> > > +	# and the split trees end at xen-4.6-testing)
> > > +	case "$xenbranch" in
> > > +	    xen-4.[23456]-testing)
> > > +		tree=$XENBITS:/home/xen/git/qemu-upstream
> > > -${xenbranch#xen-}.git
> > > +		git push $tree $revision:refs/heads/master
> > 
> > I think this would be clearer if not done in terms of xenbranch.  I
> > would use case $branch and then $branchcore.  What do you think ?
> 
> Good idea.

$branch is a bit wordy at this point, but $branchcore is usable for both
cases incrementally:

diff --git a/ap-push b/ap-push
index c3bc814..41acb39 100755
--- a/ap-push
+++ b/ap-push
@@ -77,9 +77,9 @@ qemu-upstream-*-testing)
        # For now also push to the old split trees for historical
        # branches only (qemu-upstream started with xen-4.2-testing
        # and the split trees end at xen-4.6-testing)
-       case "$xenbranch" in
-           xen-4.[23456]-testing)
-               tree=$XENBITS:/home/xen/git/qemu-upstream-${xenbranch#xen-}.git
+       case "$branchcore" in
+           4.[23456])
+               tree=$XENBITS:/home/xen/git/qemu-upstream-${branchcore}-testing.git
                git push $tree $revision:refs/heads/master
                ;;
        esac

Look ok?