mirror of
https://github.com/go-gitea/gitea
synced 2025-07-23 02:38:35 +00:00
Change how merged PR commit info are prepared (#3368)
* Change how merged PR commits and diff are made * Update code.gitea.io/git dependency * Fix typo * Remove unneeded local variable
This commit is contained in:
8
vendor/code.gitea.io/git/repo_commit.go
generated
vendored
8
vendor/code.gitea.io/git/repo_commit.go
generated
vendored
@@ -11,8 +11,8 @@ import (
|
||||
"strings"
|
||||
)
|
||||
|
||||
// getRefCommitID returns the last commit ID string of given reference (branch or tag).
|
||||
func (repo *Repository) getRefCommitID(name string) (string, error) {
|
||||
// GetRefCommitID returns the last commit ID string of given reference (branch or tag).
|
||||
func (repo *Repository) GetRefCommitID(name string) (string, error) {
|
||||
stdout, err := NewCommand("show-ref", "--verify", name).RunInDir(repo.Path)
|
||||
if err != nil {
|
||||
if strings.Contains(err.Error(), "not a valid ref") {
|
||||
@@ -25,12 +25,12 @@ func (repo *Repository) getRefCommitID(name string) (string, error) {
|
||||
|
||||
// GetBranchCommitID returns last commit ID string of given branch.
|
||||
func (repo *Repository) GetBranchCommitID(name string) (string, error) {
|
||||
return repo.getRefCommitID(BranchPrefix + name)
|
||||
return repo.GetRefCommitID(BranchPrefix + name)
|
||||
}
|
||||
|
||||
// GetTagCommitID returns last commit ID string of given tag.
|
||||
func (repo *Repository) GetTagCommitID(name string) (string, error) {
|
||||
return repo.getRefCommitID(TagPrefix + name)
|
||||
return repo.GetRefCommitID(TagPrefix + name)
|
||||
}
|
||||
|
||||
// parseCommitData parses commit information from the (uncompressed) raw
|
||||
|
6
vendor/vendor.json
vendored
6
vendor/vendor.json
vendored
@@ -3,10 +3,10 @@
|
||||
"ignore": "test appengine",
|
||||
"package": [
|
||||
{
|
||||
"checksumSHA1": "1WHdGmDRsFRTD5N69l+MEbZr+nM=",
|
||||
"checksumSHA1": "Gz+a5Qo4PCiB/Gf2f02v8HEAxDM=",
|
||||
"path": "code.gitea.io/git",
|
||||
"revision": "f4a91053671bee69f1995e456c1541668717c19d",
|
||||
"revisionTime": "2018-01-07T06:11:05Z"
|
||||
"revision": "6798d0f202cdc7187c00a467b586a4bdee27e8c9",
|
||||
"revisionTime": "2018-01-14T14:37:32Z"
|
||||
},
|
||||
{
|
||||
"checksumSHA1": "Qtq0kW+BnpYMOriaoCjMa86WGG8=",
|
||||
|
Reference in New Issue
Block a user