From ff07a411a2363d04518863638dc42b911716a760 Mon Sep 17 00:00:00 2001 From: CapsuleCD Date: Tue, 19 Sep 2017 21:12:06 +0000 Subject: [PATCH] (v2.0.20) Automated packaging of release by CapsuleCD --- pkg/utils/git.go | 6 ------ pkg/version/version.go | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkg/utils/git.go b/pkg/utils/git.go index 4cc543b..7b42a1e 100644 --- a/pkg/utils/git.go +++ b/pkg/utils/git.go @@ -32,7 +32,6 @@ func GitClone(parentPath string, repositoryName string, gitRemote string) (strin return absPath, err } - // https://stackoverflow.com/questions/13638235/git-checkout-remote-reference // https://gist.github.com/danielfbm/ba4ae91efa96bb4771351bdbd2c8b06f // https://github.com/libgit2/git2go/issues/126 @@ -54,7 +53,6 @@ func GitFetchPullRequest(repoPath string, pullRequestNumber string, localBranchN } time.Sleep(time.Second) - // fetch the pull request merge and head references into this repo. ferr := remote.Fetch([]string{"+refs/pull/*:refs/remotes/origin/pr/*"}, new(git2go.FetchOptions), "") if ferr != nil { @@ -62,7 +60,6 @@ func GitFetchPullRequest(repoPath string, pullRequestNumber string, localBranchN return ferr } - // Get a reference to the PR merge branch in this repo prRef, err := repo.References.Lookup(fmt.Sprintf("refs/remotes/origin/pr/%s/merge", pullRequestNumber)) if err != nil { @@ -78,8 +75,6 @@ func GitFetchPullRequest(repoPath string, pullRequestNumber string, localBranchN } defer prCommit.Free() - - prLocalBranch, err := repo.LookupBranch(localBranchName, git2go.BranchLocal) // No local branch, lets create one if prLocalBranch == nil || err != nil { @@ -95,7 +90,6 @@ func GitFetchPullRequest(repoPath string, pullRequestNumber string, localBranchN } defer prLocalBranch.Free() - // Getting the tree for the branch localCommit, err := repo.LookupCommit(prLocalBranch.Target()) if err != nil { diff --git a/pkg/version/version.go b/pkg/version/version.go index 32cdfbf..9dbe50e 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -2,4 +2,4 @@ package version // VERSION is the app-global version string, which will be replaced with a // new value during packaging -const VERSION = "2.0.19" +const VERSION = "2.0.20"