github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 10:55:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Reinstate --single-branch when cloning themes (#19026)

Browse Source
This commit is contained in:
Daniel Waterworth 2022-11-15 13:23:57 -06:00 committed by GitHub
parent ac272c041e
commit 47709c6d49
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/theme_store/git_importer.rb
View File

@ -108,7 +108,7 @@ class ThemeStore::GitImporter
args << "clone"
if @branch.present?
args.concat(["-b", @branch])
args.concat(['--single-branch', "-b", @branch])
end
args.concat([@url, @temp_folder])

4
spec/lib/theme_store/git_importer_spec.rb
View File

@ -60,7 +60,7 @@ RSpec.describe ThemeStore::GitImporter do
.expects(:execute_command)
.with(
{ "GIT_TERMINAL_PROMPT" => "0" },
"git", "-c", "http.followRedirects=false", "-c", "http.curloptResolve=github.com:443:192.0.2.100", "clone", "-b", branch, "https://github.com/example/example.git", @temp_folder, timeout: 20
"git", "-c", "http.followRedirects=false", "-c", "http.curloptResolve=github.com:443:192.0.2.100", "clone", "--single-branch", "-b", branch, "https://github.com/example/example.git", @temp_folder, timeout: 20
)
importer = ThemeStore::GitImporter.new(url, branch: branch)
@ -72,7 +72,7 @@ RSpec.describe ThemeStore::GitImporter do
.expects(:execute_command)
.with(
{ "GIT_SSH_COMMAND" => "ssh -i #{@ssh_folder}/id_rsa -o IdentitiesOnly=yes -o IdentityFile=#{@ssh_folder}/id_rsa -o StrictHostKeyChecking=no" },
"git", "clone", "-b", branch, "ssh://git@github.com/example/example.git", @temp_folder, timeout: 20
"git", "clone", "--single-branch", "-b", branch, "ssh://git@github.com/example/example.git", @temp_folder, timeout: 20
)
importer = ThemeStore::GitImporter.new(ssh_url, private_key: "private_key", branch: branch)