github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-20 15:41:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: copy local theme changes to correct temp folder when diffing updates to remote theme

Browse Source 
Previously, local changes were being copied to a subfolder, resulting in lots of false positive diff changes.
This commit is contained in:
Penar Musaraj 2019-06-27 13:01:09 -04:00
parent 23c5da4617
commit 5cf5e73536
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/theme_store/git_importer.rb
View File

@ -38,7 +38,7 @@ class ThemeStore::GitImporter
Dir.chdir(@temp_folder) do
Discourse::Utils.execute_command("git", "checkout", local_version)
Discourse::Utils.execute_command("rm -rf ./*/")
Discourse::Utils.execute_command("cp", "-rf", "#{local_temp_folder}/#{exporter.export_name}/", @temp_folder)
Discourse::Utils.execute_command("cp", "-rf", "#{local_temp_folder}/#{exporter.export_name}/.", @temp_folder)
Discourse::Utils.execute_command("git", "checkout", "about.json")
# adding and diffing on staged so that we catch uploads
Discourse::Utils.execute_command("git", "add", "-A")