lavender-legacy/gitea
7
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update git module (#2037)

Browse source
This commit is contained in:
Lauris BH 2017-06-23 03:06:43 +03:00 committed by Lunny Xiao
parent cc6b3f60c6
commit c259c436d7
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
vendor/code.gitea.io/git/commit.go generated vendored
View file

@ -235,6 +235,9 @@ func (c *Commit) GetSubModules() (*ObjectCache, error) {
entry, err := c.GetTreeEntryByPath(".gitmodules") entry, err := c.GetTreeEntryByPath(".gitmodules")
if err != nil { if err != nil {
if _, ok := err.(ErrNotExist); ok {
return nil, nil
}
return nil, err return nil, err
} }
rd, err := entry.Blob().Data() rd, err := entry.Blob().Data()
@ -273,9 +276,11 @@ func (c *Commit) GetSubModule(entryname string) (*SubModule, error) {
return nil, err return nil, err
} }
module, has := modules.Get(entryname) if modules != nil {
if has { module, has := modules.Get(entryname)
return module.(*SubModule), nil if has {
return module.(*SubModule), nil
}
} }
return nil, nil return nil, nil
} }

4
vendor/code.gitea.io/git/tree_entry.go generated vendored
View file

@ -264,7 +264,9 @@ func getNextCommitInfos(state *getCommitInfoState) error {
return fmt.Errorf("Unquote: %v", err) return fmt.Errorf("Unquote: %v", err)
} }
} }
state.update(entryPath) if err = state.update(entryPath); err != nil {
return err
}
} }
i++ // skip blank line i++ // skip blank line
if len(state.entries) == len(state.commits) { if len(state.entries) == len(state.commits) {

6
vendor/vendor.json vendored
View file

@ -3,10 +3,10 @@
"ignore": "test appengine", "ignore": "test appengine",
"package": [ "package": [
{ {
"checksumSHA1": "Ve00iavGUw8bQmDeXuEJ51wEk40=", "checksumSHA1": "Ju4zZF8u/DPrZYEEY40rogh3hyQ=",
"path": "code.gitea.io/git", "path": "code.gitea.io/git",
"revision": "a34a13dea30c0d242c5256cc321b48f8041ce095", "revision": "51eca9e92242b93a0510edd19f1db6fc11ca1028",
"revisionTime": "2017-06-20T02:08:21Z" "revisionTime": "2017-06-21T01:06:07Z"
}, },
{ {
"checksumSHA1": "nLhT+bLMj8uLICP+EZbrdoQe6mM=", "checksumSHA1": "nLhT+bLMj8uLICP+EZbrdoQe6mM=",