finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Handle submodules without a .gitmodules entry - fix #1023

Browse source
This commit is contained in:
Filippo Valsorda 2015-03-10 03:08:17 +00:00
parent 5e763baa12
commit 5d5d774e03
4 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
routers/repo/view.go
View file

@ -141,13 +141,17 @@ func Home(ctx *middleware.Context) {
ctx.Handle(500, "GetSubModule", err)
return
}
smUrl := ""
if sm != nil {
smUrl = sm.Url
}
c, err := ctx.Repo.Commit.GetCommitOfRelPath(filepath.Join(treePath, te.Name()))
if err != nil {
ctx.Handle(500, "GetCommitOfRelPath", err)
return
}
files = append(files, []interface{}{te, git.NewSubModuleFile(c, sm.Url, te.Id.String())})
files = append(files, []interface{}{te, git.NewSubModuleFile(c, smUrl, te.Id.String())})
}
}
ctx.Data["Files"] = files