Skip to content

Commit 3d840a6

Browse files
committed
revert untouched files
1 parent 846d3c0 commit 3d840a6

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

cmd/gorepomod/internal/git/runner.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,7 @@ func (gr *Runner) AssureOnMainBranch() error {
258258
// CheckoutMainBranch does that.
259259
func (gr *Runner) CheckoutMainBranch() error {
260260
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)
263262
}
264263

265264
// FetchRemote does that.

releasing/helpers.sh

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,12 @@
22
# Copyright 2022 The Kubernetes Authors.
33
# SPDX-License-Identifier: Apache-2.0
44

5-
ORIGIN_MASTER="feat/5449-add-release-automation"
6-
UPSTREAM_REPO="upstream"
7-
UPSTREAM_MASTER="master"
85

96
function createBranch {
107
branch=$1
118
title=$2
129
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
1911
git checkout -b $branch
2012
git commit -a -m "$title"
2113
git push -f origin $branch

0 commit comments

Comments
 (0)