Skip to content

Fix 500 Error with branch and tag sharing the same name #16040

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

Merged
merged 3 commits into from
Jun 23, 2021
Merged

Fix 500 Error with branch and tag sharing the same name #16040

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d64461
Fix 500 Error with branch and tag sharing the same name #15592
Viktor-Yakovchuk May 31, 2021
fde8251
Merge branch 'main' into main
techknowlogick Jun 23, 2021
a0afd13
fix logging
6543 Jun 23, 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
Prev Previous commit
fix logging
  • Loading branch information
@6543
6543 authored Jun 23, 2021
commit a0afd13f773a9b68a8579aa5d8fdff39c8e7957d
4 changes: 2 additions & 2 deletions services/pull/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,11 +432,11 @@ func pushToBaseRepoHelper(pr *models.PullRequest, prefixHeadBranch string) (err
log.Info("Unable to push PR head for %s#%d (%-v:%s) due to rejection:\nStdout: %s\nStderr: %s\nError: %v", pr.BaseRepo.FullName(), pr.Index, pr.BaseRepo, gitRefName, rejectErr.StdOut, rejectErr.StdErr, rejectErr.Err)
return err
} else if git.IsErrMoreThanOne(err) {
log.Info("Retrying to push with refs/heads/%s", pr.HeadBranch)
if prefixHeadBranch != "" {
log.Info("Can't push with refs/heads/%s", pr.HeadBranch)
log.Info("Can't push with %s%s", prefixHeadBranch, pr.HeadBranch)
return err
}
log.Info("Retrying to push with refs/heads/%s", pr.HeadBranch)
err = pushToBaseRepoHelper(pr, "refs/heads/")
return err
}
Expand Down