From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [PATCH OSSTEST] Switch to merged qemu-xen{,
 -traditional}.git trees
Date: Thu, 17 Sep 2015 11:47:22 +0100
Message-ID: <1442486842.18856.170.camel@citrix.com>
References: <1442482630.18856.145.camel@citrix.com>
	<1442482648-25666-1-git-send-email-ian.campbell@citrix.com>
	<22010.38503.791420.451291@mariner.uk.xensource.com>
	<1442486620.18856.168.camel@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1442486620.18856.168.camel@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Ian Jackson <Ian.Jackson@eu.citrix.com>
Cc: stefano.stabellini@eu.citrix.com, wei.liu2@citrix.com, xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org

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?