diff --git a/dev/update-package-storage/git.go b/dev/update-package-storage/git.go index 526718115c9..357b0596fa0 100644 --- a/dev/update-package-storage/git.go +++ b/dev/update-package-storage/git.go @@ -20,18 +20,18 @@ func fetchUpstream(err error, options updateOptions) error { return runGitCommand(options, "fetch", "upstream") } -func checkoutMasterBranch(err error, options updateOptions) error { +func checkoutProductionBranch(err error, options updateOptions) error { if err != nil { return err } - return runGitCommand(options, "checkout", "master") + return runGitCommand(options, "checkout", "production") } -func rebaseUpstreamMaster(err error, options updateOptions) error { +func rebaseUpstreamProduction(err error, options updateOptions) error { if err != nil { return err } - return runGitCommand(options, "rebase", "upstream/master") + return runGitCommand(options, "rebase", "upstream/production") } func addToIndex(err error, options updateOptions, packageName, packageVersion string) error { diff --git a/dev/update-package-storage/main.go b/dev/update-package-storage/main.go index 00b7e25a154..48a9df55308 100644 --- a/dev/update-package-storage/main.go +++ b/dev/update-package-storage/main.go @@ -40,8 +40,8 @@ func main() { } err = fetchUpstream(err, options) - err = checkoutMasterBranch(err, options) - err = rebaseUpstreamMaster(err, options) + err = checkoutProductionBranch(err, options) + err = rebaseUpstreamProduction(err, options) packageNames, err := listPackages(err, options) err = reviewPackages(err, options, packageNames, handlePackageChanges) if err != nil { @@ -55,7 +55,7 @@ func handlePackageChanges(err error, options updateOptions, packageName string) } packageVersion, err := detectGreatestBuiltPackageVersion(err, options, packageName) - err = checkoutMasterBranch(err, options) + err = checkoutProductionBranch(err, options) released, err := checkIfPackageReleased(err, options, packageName, packageVersion) if released { return nil