diff --git a/lib/theme_store/git_importer.rb b/lib/theme_store/git_importer.rb index 15b145d0ca..409a39eca4 100644 --- a/lib/theme_store/git_importer.rb +++ b/lib/theme_store/git_importer.rb @@ -87,9 +87,9 @@ class ThemeStore::GitImporter def import_public! begin if @branch.present? - Discourse::Utils.execute_command("git", "clone", "--single-branch", "-b", @branch, @url, @temp_folder) + Discourse::Utils.execute_command({ "GIT_TERMINAL_PROMPT" => "0" }, "git", "clone", "--single-branch", "-b", @branch, @url, @temp_folder) else - Discourse::Utils.execute_command("git", "clone", @url, @temp_folder) + Discourse::Utils.execute_command({ "GIT_TERMINAL_PROMPT" => "0" }, "git", "clone", @url, @temp_folder) end rescue RuntimeError raise RemoteTheme::ImportError.new(I18n.t("themes.import_error.git")) diff --git a/spec/components/theme_store/git_importer_spec.rb b/spec/components/theme_store/git_importer_spec.rb index 46783d5c38..914ce44ffd 100644 --- a/spec/components/theme_store/git_importer_spec.rb +++ b/spec/components/theme_store/git_importer_spec.rb @@ -22,14 +22,14 @@ describe ThemeStore::GitImporter do end it "should import from http url" do - Discourse::Utils.expects(:execute_command).with("git", "clone", url, @temp_folder) + Discourse::Utils.expects(:execute_command).with({ "GIT_TERMINAL_PROMPT" => "0" }, "git", "clone", url, @temp_folder) importer = ThemeStore::GitImporter.new(url) importer.import! end it "should work with trailing slash url" do - Discourse::Utils.expects(:execute_command).with("git", "clone", url, @temp_folder) + Discourse::Utils.expects(:execute_command).with({ "GIT_TERMINAL_PROMPT" => "0" }, "git", "clone", url, @temp_folder) importer = ThemeStore::GitImporter.new(trailing_slash_url) importer.import! @@ -45,7 +45,7 @@ describe ThemeStore::GitImporter do end it "should import branch from http url" do - Discourse::Utils.expects(:execute_command).with("git", "clone", "--single-branch", "-b", branch, url, @temp_folder) + Discourse::Utils.expects(:execute_command).with({ "GIT_TERMINAL_PROMPT" => "0" }, "git", "clone", "--single-branch", "-b", branch, url, @temp_folder) importer = ThemeStore::GitImporter.new(url, branch: branch) importer.import!