mirror of
https://github.com/go-gitea/gitea.git
synced 2025-10-02 06:48:34 +00:00
Rename pull request GetGitRefName to GetGitHeadRefName (#35093)
This commit is contained in:
@@ -231,7 +231,7 @@ func isSignedIfRequired(ctx context.Context, pr *issues_model.PullRequest, doer
|
||||
return true, nil
|
||||
}
|
||||
|
||||
sign, _, _, err := asymkey_service.SignMerge(ctx, pr, doer, pr.BaseRepo.RepoPath(), pr.BaseBranch, pr.GetGitRefName())
|
||||
sign, _, _, err := asymkey_service.SignMerge(ctx, pr, doer, pr.BaseRepo.RepoPath(), pr.BaseBranch, pr.GetGitHeadRefName())
|
||||
|
||||
return sign, err
|
||||
}
|
||||
@@ -277,7 +277,7 @@ func getMergeCommit(ctx context.Context, pr *issues_model.PullRequest) (*git.Com
|
||||
return nil, fmt.Errorf("unable to load base repo for %s: %w", pr, err)
|
||||
}
|
||||
|
||||
prHeadRef := pr.GetGitRefName()
|
||||
prHeadRef := pr.GetGitHeadRefName()
|
||||
|
||||
// Check if the pull request is merged into BaseBranch
|
||||
if _, _, err := git.NewCommand("merge-base", "--is-ancestor").
|
||||
|
Reference in New Issue
Block a user