From: George Dunlap <george.dunlap@citrix.com>
Date: Wed, 27 Sep 2017 13:48:54 +0000 (+0100)
Subject: Use staging rather than master as the default base for `master` commits
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=54c104c;p=people%2Fgdunlap%2Fxsatool.git

Use staging rather than master as the default base for `master` commits

The 'master' versions are meant to be applied to staging, and aren't
generally expected to be used directly by downstreams.  If there's a
difference between master and staging, having it apply to staging is
more useful.

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

diff --git a/git.go b/git.go
index 321d96f..1554bc6 100644
--- a/git.go
+++ b/git.go
@@ -289,7 +289,7 @@ func (r Repo) AmClean(amglob string) (out []byte, err error) {
 	out, err = r.gitCmd(append([]string{"am", "--reject"}, files...)...)
 
 	if err != nil {
-		fmt.Printf("am failed, cleaning up tree")
+		fmt.Printf("am failed, cleaning up tree\n")
 		r.gitCmd("am", "--abort")
 		r.gitCmd("checkout", "-f")
 		r.gitCmd("clean", "-ffdx")
diff --git a/repo.go b/repo.go
index de147ce..5cb36d2 100644
--- a/repo.go
+++ b/repo.go
@@ -164,6 +164,10 @@ func MainRepoUpdate(unused *XSAMeta, args []string) (ret int) {
 
 		branches = append([]string{"master"}, branches...)
 
+		if tree == TreeXen || tree == TreeQemuU {
+			branches = append([]string{"staging"}, branches...)
+		}
+
 		for _, branch := range branches {
 			if _, err = xr.MergeDefault(branch); err != nil {
 				err = fmt.Errorf("Merging branch %s on tree %v: %v\n",
diff --git a/xen.go b/xen.go
index 5bdbeeb..e146949 100644
--- a/xen.go
+++ b/xen.go
@@ -226,7 +226,7 @@ func (xr *XenRepo) releaseTagPrefix() (s string) {
 
 func XenStableBranch(v XenVersion) string {
 	if v == XenVersionMaster {
-		return "master"
+		return "staging"
 	} else {
 		return "stable-" + v.String()
 	}