Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refresh hash after pull for branch refs #791

Merged
merged 4 commits into from
Sep 8, 2021
Merged

Refresh hash after pull for branch refs #791

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d1bf74
Refresh hash after pull for branch refs
ChristopherHX Aug 30, 2021
6b84537
Merge branch 'master' into fix/branch-not-updated-correctly
ChristopherHX Sep 2, 2021
3e46d07
Bump
ChristopherHX Sep 2, 2021
a86f728
Merge branch 'master' into fix/branch-not-updated-correctly
mergify[bot] Sep 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pkg/common/git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,13 @@ func NewGitCloneExecutor(input NewGitCloneExecutorInput) Executor {
}
logger.Debugf("Cloned %s to %s", input.URL, input.Dir)

if hash.String() != input.Ref && refType == "branch" {
logger.Debugf("Provided ref is not a sha. Updating branch ref after pull")
if hash, err = r.ResolveRevision(rev); err != nil {
logger.Errorf("Unable to resolve %s: %v", input.Ref, err)
return err
}
}
if err = w.Checkout(&git.CheckoutOptions{
Hash: *hash,
Force: true,
Expand Down