From 5d5d774e03ea02b29ff2bd25e1bf63ce82851fc5 Mon Sep 17 00:00:00 2001
From: Filippo Valsorda <filippo@cloudflare.com>
Date: Tue, 10 Mar 2015 03:08:17 +0000
Subject: Handle submodules without a .gitmodules entry - fix #1023

---
 modules/git/commit.go    | 4 ++--
 modules/git/submodule.go | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'modules/git')

diff --git a/modules/git/commit.go b/modules/git/commit.go
index d2d373da12..4e254dcec1 100644
--- a/modules/git/commit.go
+++ b/modules/git/commit.go
@@ -88,11 +88,11 @@ func (c *Commit) GetCommitOfRelPath(relPath string) (*Commit, error) {
 }
 
 func (c *Commit) GetSubModule(entryname string) (*SubModule, error) {
-	moduels, err := c.GetSubModules()
+	modules, err := c.GetSubModules()
 	if err != nil {
 		return nil, err
 	}
-	return moduels[entryname], nil
+	return modules[entryname], nil
 }
 
 func (c *Commit) GetSubModules() (map[string]*SubModule, error) {
diff --git a/modules/git/submodule.go b/modules/git/submodule.go
index 6927f8cbad..0c7c2696c3 100644
--- a/modules/git/submodule.go
+++ b/modules/git/submodule.go
@@ -31,6 +31,10 @@ func NewSubModuleFile(c *Commit, refUrl, refId string) *SubModuleFile {
 
 // RefUrl guesses and returns reference URL.
 func (sf *SubModuleFile) RefUrl() string {
+	if sf.refUrl == "" {
+		return ""
+	}
+
 	url := strings.TrimSuffix(sf.refUrl, ".git")
 
 	// git://xxx/user/repo
-- 
cgit v1.2.3