File tree Expand file tree Collapse file tree 2 files changed +2
-11
lines changed
cmd/gorepomod/internal/git Expand file tree Collapse file tree 2 files changed +2
-11
lines changed Original file line number Diff line number Diff line change @@ -258,8 +258,7 @@ func (gr *Runner) AssureOnMainBranch() error {
258
258
// CheckoutMainBranch does that.
259
259
func (gr * Runner ) CheckoutMainBranch () error {
260
260
gr .comment ("checking out main branch" )
261
- fullBranchSpec := fmt .Sprintf ("%s/%s" , remoteOrigin , mainBranch )
262
- return gr .runNoOut (noHarmDone , "checkout" , fullBranchSpec )
261
+ return gr .runNoOut (noHarmDone , "checkout" , mainBranch )
263
262
}
264
263
265
264
// FetchRemote does that.
Original file line number Diff line number Diff line change 2
2
# Copyright 2022 The Kubernetes Authors.
3
3
# SPDX-License-Identifier: Apache-2.0
4
4
5
- ORIGIN_MASTER=" feat/5449-add-release-automation"
6
- UPSTREAM_REPO=" upstream"
7
- UPSTREAM_MASTER=" master"
8
5
9
6
function createBranch {
10
7
branch=$1
11
8
title=$2
12
9
echo " Making branch $branch : \" $title \" "
13
- # Check if release branch exists
14
- if git show-ref --quiet " refs/heads/${branch} " ; then
15
- git fetch --tags upstream master
16
- git checkout $ORIGIN_MASTER
17
- git branch -D $branch # delete if it exists
18
- fi
10
+ git branch -D $branch # delete if it exists
19
11
git checkout -b $branch
20
12
git commit -a -m " $title "
21
13
git push -f origin $branch
You can’t perform that action at this time.
0 commit comments