xsatool: Use xsa/ prefix for all xsatool-created branches

Signed-off-by: George Dunlap <george.dunlap@citrix.com>

diff --git a/README.md b/README.md
index b8453c3c63e3a9b62cc10f9ac99d3d8a1a1ebe9a..97b35848399a5162381efbe601bad3589f09061a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -115,8 +115,6 @@ effects on the tree:
 
 - Create, delete, or modify branches matching `xsa/*`
 
-**FIXME** Need to move test branches under xsa
-
 - "Fetch" from master and stable-* branches
 
 ## Branch names

diff --git a/recipe.go b/recipe.go
index 68d009be1d45e541007415de52f95b0675e59126..2c5b700354b1ce40804a9fa62e648be08ed5b154 100644 (file)
--- a/recipe.go
+++ b/recipe.go
@@ -488,7 +488,7 @@ func (r *Recipe) Build(prefix string) (err error) {
        xenrepo := G.repos.XenRepos[TreeXen]
 
        /* Always check out a temporary branch for xen */
-       tmpBranch := "tmp"
+       tmpBranch := "xsa/tmp"
        if tr, prs := r.Recipes[TreeXen]; prs && tr.HasPatches() {
                err = xenrepo.MakeBranch(tmpBranch, branch)
                if err != nil {

diff --git a/test.go b/test.go
index 5ba91e1e0c880f55469952891e6bcc86788ae4ae..d1d085a54164db121f5ca345b90da9a0417113bc 100644 (file)
--- a/test.go
+++ b/test.go
@@ -9,7 +9,7 @@ func test(xsa *XSAMeta, args []string, apply bool, build bool) (ret int) {
        vers := VersionsFromArgs(xsa, args, false)
 
        for _, v := range vers {
-               prefix := "test"
+               prefix := "xsa/test"
                r := xsa.GetRecipe(v)
                if r == nil {
                        fmt.Printf("Couldn't find recipe for XenVersion %s\n", v)