Skip to content
This repository has been archived by the owner on Aug 9, 2021. It is now read-only.

Commit

Permalink
(v2.0.20) Automated packaging of release by CapsuleCD
Browse files Browse the repository at this point in the history
  • Loading branch information
CapsuleCD committed Sep 19, 2017
1 parent 61b7e71 commit ff07a41
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
6 changes: 0 additions & 6 deletions pkg/utils/git.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -54,15 +53,13 @@ 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 {
log.Print("Failed to fetch PR references from remote")
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 {
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion pkg/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"

0 comments on commit ff07a41

Please sign in to comment.