summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-08-11 18:23:47 +0200
committerJacob Vosmaer <jacob@gitlab.com>2017-08-14 10:53:02 +0200
commitd9b6fd4fba1fa996ba6c71358ad933ba2328ba18 (patch)
treeba46a8598e3d381c0bdf0da8d503bfa66e2a7ab0 /lib
parentc19ea197c7195771ddd68fa298f72c28612cadd8 (diff)
downloadgitlab-ce-d9b6fd4fba1fa996ba6c71358ad933ba2328ba18.tar.gz
Handle missing .gitmodules when getting submodule urlsmalformed-submodule
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/git/repository.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 7000b173075..081423eb0db 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -827,6 +827,8 @@ module Gitlab
return unless commit_object && commit_object.type == :COMMIT
gitmodules = gitaly_commit_client.tree_entry(ref, '.gitmodules', Gitlab::Git::Blob::MAX_DATA_DISPLAY_SIZE)
+ return unless gitmodules
+
found_module = GitmodulesParser.new(gitmodules.data).parse[path]
found_module && found_module['url']