diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2017-09-01 17:27:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-01 17:27:54 +0200 |
| commit | 8ce9f5f240730ce21f50e42409d17fac7d71e051 (patch) | |
| tree | 1922e3a721c4c19889557f96108076c325b95fbd /submodule.go | |
| parent | 3ca370277427c5d508f0dedacbd559523a305121 (diff) | |
| parent | f1e58e0d30095cf768ff04d379b5e4145a874be8 (diff) | |
| download | go-git-8ce9f5f240730ce21f50e42409d17fac7d71e051.tar.gz | |
Merge pull request #572 from mcuadros/reset
Worktree.Reset refactor and Soft, Merge, Hard and Mixed modes
Diffstat (limited to 'submodule.go')
| -rw-r--r-- | submodule.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/submodule.go b/submodule.go index fd3d173..de8ac73 100644 --- a/submodule.go +++ b/submodule.go @@ -62,14 +62,17 @@ func (s *Submodule) Status() (*SubmoduleStatus, error) { } func (s *Submodule) status(idx *index.Index) (*SubmoduleStatus, error) { + status := &SubmoduleStatus{ + Path: s.c.Path, + } + e, err := idx.Entry(s.c.Path) - if err != nil { + if err != nil && err != index.ErrEntryNotFound { return nil, err } - status := &SubmoduleStatus{ - Path: s.c.Path, - Expected: e.Hash, + if e != nil { + status.Expected = e.Hash } if !s.initialized { |