update git module (#2037)

tokarchuk/v1.17
Lauris BH 8 years ago committed by Lunny Xiao
parent cc6b3f60c6
commit c259c436d7
  1. 11
      vendor/code.gitea.io/git/commit.go
  2. 4
      vendor/code.gitea.io/git/tree_entry.go
  3. 6
      vendor/vendor.json

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

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

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

Loading…
Cancel
Save