From 162a263e12c9e4372b364861451048dc8b72a88d Mon Sep 17 00:00:00 2001 From: viletyy Date: Mon, 20 Mar 2023 18:12:43 +0800 Subject: [PATCH 1/2] fix submodule is nil panic --- services/repository/files/content.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/repository/files/content.go b/services/repository/files/content.go index 31827e8846ed3..3d41c4433b2ce 100644 --- a/services/repository/files/content.go +++ b/services/repository/files/content.go @@ -214,7 +214,9 @@ func GetContents(ctx context.Context, repo *repo_model.Repository, treePath, ref if err != nil { return nil, err } - contentsResponse.SubmoduleGitURL = &submodule.URL + if submodule != nil { + contentsResponse.SubmoduleGitURL = &submodule.URL + } } // Handle links if entry.IsRegular() || entry.IsLink() { From 18485f59ae0ae5c234d83a87f2de7b3f53f7bfd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A5=E8=87=AA=E6=9D=91=E9=87=8C=E7=9A=84=E5=B0=8F?= =?UTF-8?q?=E8=9E=83=E8=9F=B9?= Date: Mon, 20 Mar 2023 23:22:32 +0800 Subject: [PATCH 2/2] Update services/repository/files/content.go add subomodule url is blank condition Co-authored-by: delvh --- services/repository/files/content.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/repository/files/content.go b/services/repository/files/content.go index 3d41c4433b2ce..6f6dc91d859ab 100644 --- a/services/repository/files/content.go +++ b/services/repository/files/content.go @@ -214,7 +214,7 @@ func GetContents(ctx context.Context, repo *repo_model.Repository, treePath, ref if err != nil { return nil, err } - if submodule != nil { + if submodule != nil && submodule.URL != "" { contentsResponse.SubmoduleGitURL = &submodule.URL } }