fix commit tree view when submodule file lost (#68)

lunny · appleboy · commit 94d75c2432a9 · 2017-06-20T20:05:24.000-05:00
diff --git a/commit.go b/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
 }

Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,9 @@ func (c Commit) GetSubModules() (ObjectCache, error) {`
`235`	`235`
`236`	`236`	`entry, err := c.GetTreeEntryByPath(".gitmodules")`
`237`	`237`	`if err != nil {`
	`238`	`+ if _, ok := err.(ErrNotExist); ok {`
	`239`	`+ return nil, nil`
	`240`	`+ }`
`238`	`241`	`return nil, err`
`239`	`242`	`}`
`240`	`243`	`rd, err := entry.Blob().Data()`
`@@ -273,9 +276,11 @@ func (c Commit) GetSubModule(entryname string) (SubModule, error) {`
`273`	`276`	`return nil, err`
`274`	`277`	`}`
`275`	`278`
`276`		`- module, has := modules.Get(entryname)`
`277`		`- if has {`
`278`		`- return module.(*SubModule), nil`
	`279`	`+ if modules != nil {`
	`280`	`+ module, has := modules.Get(entryname)`
	`281`	`+ if has {`
	`282`	`+ return module.(*SubModule), nil`
	`283`	`+ }`
`279`	`284`	`}`
`280`	`285`	`return nil, nil`
`281`	`286`	`}`