Preconfigure git branches

just as "git clone" and "gbp clone" would do.

Author: anthonyfok

make.go

@@ -411,6 +411,8 @@ func createGitRepository(debsrc, gopkg, orig string, u *upstream,
 		return dir, err
 	}
 
+	// [remote "origin"]
+
 	originURL := "[email protected]:go-team/packages/" + debsrc + ".git"
 	log.Printf("Adding remote \"origin\" with URL %q\n", originURL)
 	if err := runGitCommandIn(dir, "remote", "add", "origin", originURL); err != nil {
@@ -423,6 +425,27 @@ func createGitRepository(debsrc, gopkg, orig string, u *upstream,
 		return dir, err
 	}
 
+	// Preconfigure branches
+
+	var debianBranch string
+	if dep14 {
+		debianBranch = "debian/sid"
+	} else {
+		debianBranch = "master"
+	}
+	branches := []string{debianBranch, "upstream"}
+	if pristineTar {
+		branches = append(branches, "pristine-tar")
+	}
+	for _, branch := range branches {
+		if err := runGitCommandIn(dir, "config", "branch."+branch+".remote", "origin"); err != nil {
+			return dir, err
+		}
+		if err := runGitCommandIn(dir, "config", "branch."+branch+".merge", "refs/heads/"+branch); err != nil {
+			return dir, err
+		}
+	}
+
 	if includeUpstreamHistory {
 		u.remote, err = shortHostName(gopkg, allowUnknownHoster)
 		if err != nil {