github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 05:03:39 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

FIX: allow plugin pinning to fetch missing commits

Browse Source 
Add update for fetching git commits if they do not exist, eg with
clone --depth 1 - only can fetch via git fetch --depth 1 {remote} {ref}
the ref needs to be a full, non-ambiguous reference.
This commit is contained in:
Jeff Wong 2020-08-12 16:55:49 -07:00
parent 5011435ec7
commit 787ad7d84d
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/tasks/plugin.rake
View File

@ -120,7 +120,7 @@ task 'plugin:pull_compatible', :plugin do |t, args|
# Checkout value of the version compat # Checkout value of the version compat
if checkout_version if checkout_version
puts "checking out compatible #{plugin} version: #{checkout_version}" puts "checking out compatible #{plugin} version: #{checkout_version}"
update_status = system("git -C '#{plugin_path}' reset --hard #{checkout_version}") update_status = system("git -C '#{plugin_path}' cat-file -e #{checkout_version} || git -C '#{plugin_path}' fetch --depth 1 $(git -C '#{plugin_path}' rev-parse --symbolic-full-name @{upstream} | awk -F '/' '{print $3}') #{checkout_version}; git -C '#{plugin_path}' reset --hard #{checkout_version}")
abort('Unable to checkout a compatible plugin version') unless update_status abort('Unable to checkout a compatible plugin version') unless update_status
else else
puts "#{plugin} is already at latest compatible version" puts "#{plugin} is already at latest compatible version"

3
lib/theme_store/git_importer.rb
View File

@ -25,8 +25,7 @@ class ThemeStore::GitImporter
end end
if version = Discourse.find_compatible_git_resource(@temp_folder) if version = Discourse.find_compatible_git_resource(@temp_folder)
Discourse::Utils.execute_command(chdir: @temp_folder) do |runner| Discourse::Utils.execute_command(chdir: @temp_folder) do |runner|
Rails.logger.warn "git reset --hard #{version}" return runner.exec("git cat-file -e #{version} || git fetch --depth 1 $(git rev-parse --symbolic-full-name @{upstream} | awk -F '/' '{print $3}') #{version}; git reset --hard #{version}")
return runner.exec("git", "reset", "--hard", version)
end end
end end
end end