diff options
author | Lauris BH <lauris@nix.lv> | 2017-06-23 03:06:43 +0300 |
---|---|---|
committer | Lunny Xiao <xiaolunwen@gmail.com> | 2017-06-23 08:06:43 +0800 |
commit | c259c436d72df1a4a2e49d231dffe30d78c004fc (patch) | |
tree | 620be8b7285ec8199720e58555cb49e658008d21 /vendor/code.gitea.io | |
parent | cc6b3f60c69a326f43e15d405bc9be04e767bd2d (diff) | |
download | gitea-c259c436d72df1a4a2e49d231dffe30d78c004fc.tar.gz gitea-c259c436d72df1a4a2e49d231dffe30d78c004fc.zip |
update git module (#2037)
Diffstat (limited to 'vendor/code.gitea.io')
-rw-r--r-- | vendor/code.gitea.io/git/commit.go | 11 | ||||
-rw-r--r-- | vendor/code.gitea.io/git/tree_entry.go | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/vendor/code.gitea.io/git/commit.go b/vendor/code.gitea.io/git/commit.go index 28dd264835..0a95bc90b7 100644 --- a/vendor/code.gitea.io/git/commit.go +++ b/vendor/code.gitea.io/git/commit.go @@ -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 } diff --git a/vendor/code.gitea.io/git/tree_entry.go b/vendor/code.gitea.io/git/tree_entry.go index 4c69002f4f..7ea4d211a7 100644 --- a/vendor/code.gitea.io/git/tree_entry.go +++ b/vendor/code.gitea.io/git/tree_entry.go @@ -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) { |