mirror of
https://github.com/go-gitea/gitea.git
synced 2024-09-05 23:34:19 -04:00
Updates vendor/code.gitea.io/git (#6286)
This commit is contained in:
parent
7c205607b5
commit
50631b5ac3
7
Gopkg.lock
generated
7
Gopkg.lock
generated
@ -3,11 +3,11 @@
|
|||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
branch = "master"
|
branch = "master"
|
||||||
digest = "1:0f0ada42a7b1bd64794bf8fea917c2cd626d6b0539173e3704cd764b93eb5312"
|
digest = "1:e1fa64238b0a2dbf1edf98c4af8d1b8cb65179e286d7f28006b50fa9f508ee9d"
|
||||||
name = "code.gitea.io/git"
|
name = "code.gitea.io/git"
|
||||||
packages = ["."]
|
packages = ["."]
|
||||||
pruneopts = "NUT"
|
pruneopts = "NUT"
|
||||||
revision = "8983773ac6fef49203e7ee8cdbfde3e118bc3421"
|
revision = "74d7c14dd4a3ed9c5def0dc3c1aeede399ddc5c5"
|
||||||
|
|
||||||
[[projects]]
|
[[projects]]
|
||||||
branch = "master"
|
branch = "master"
|
||||||
@ -1331,6 +1331,9 @@
|
|||||||
"gopkg.in/ini.v1",
|
"gopkg.in/ini.v1",
|
||||||
"gopkg.in/ldap.v3",
|
"gopkg.in/ldap.v3",
|
||||||
"gopkg.in/macaron.v1",
|
"gopkg.in/macaron.v1",
|
||||||
|
"gopkg.in/src-d/go-git.v4",
|
||||||
|
"gopkg.in/src-d/go-git.v4/config",
|
||||||
|
"gopkg.in/src-d/go-git.v4/plumbing",
|
||||||
"gopkg.in/testfixtures.v2",
|
"gopkg.in/testfixtures.v2",
|
||||||
"strk.kbt.io/projects/go/libravatar",
|
"strk.kbt.io/projects/go/libravatar",
|
||||||
]
|
]
|
||||||
|
9
vendor/code.gitea.io/git/repo_commit.go
generated
vendored
9
vendor/code.gitea.io/git/repo_commit.go
generated
vendored
@ -101,7 +101,11 @@ l:
|
|||||||
sig, err := newGPGSignatureFromCommitline(data, (nextline+1)+sigindex, true)
|
sig, err := newGPGSignatureFromCommitline(data, (nextline+1)+sigindex, true)
|
||||||
if err == nil && sig != nil {
|
if err == nil && sig != nil {
|
||||||
// remove signature from commit message
|
// remove signature from commit message
|
||||||
cm = cm[:sigindex-1]
|
if sigindex == 0 {
|
||||||
|
cm = ""
|
||||||
|
} else {
|
||||||
|
cm = cm[:sigindex-1]
|
||||||
|
}
|
||||||
commit.Signature = sig
|
commit.Signature = sig
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -153,13 +157,14 @@ func (repo *Repository) getCommit(id SHA1) (*Commit, error) {
|
|||||||
func (repo *Repository) GetCommit(commitID string) (*Commit, error) {
|
func (repo *Repository) GetCommit(commitID string) (*Commit, error) {
|
||||||
if len(commitID) != 40 {
|
if len(commitID) != 40 {
|
||||||
var err error
|
var err error
|
||||||
commitID, err = NewCommand("rev-parse", commitID).RunInDir(repo.Path)
|
actualCommitID, err := NewCommand("rev-parse", commitID).RunInDir(repo.Path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if strings.Contains(err.Error(), "unknown revision or path") {
|
if strings.Contains(err.Error(), "unknown revision or path") {
|
||||||
return nil, ErrNotExist{commitID, ""}
|
return nil, ErrNotExist{commitID, ""}
|
||||||
}
|
}
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
commitID = actualCommitID
|
||||||
}
|
}
|
||||||
id, err := NewIDFromString(commitID)
|
id, err := NewIDFromString(commitID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Loading…
Reference in New Issue
Block a user