IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Ignore renames when diffing theme changes (take 2)

Browse Source 
Better fix than ca6adfbd
This commit is contained in:
Penar Musaraj 2019-11-06 14:45:18 -05:00
parent 9ef97ff44f
commit 61e35ce5dc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/theme_store/git_importer.rb
View File

@ -38,9 +38,9 @@ class ThemeStore::GitImporter
Discourse::Utils.execute_command("rm -rf ./*/") 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") Discourse::Utils.execute_command("git", "checkout", "about.json")
# adding and diffing on staged so that we catch uploads # add + diff staged to catch uploads but exclude renamed assets
Discourse::Utils.execute_command("git", "add", "-A") Discourse::Utils.execute_command("git", "add", "-A")
return Discourse::Utils.execute_command("git", "diff", "--staged", "--no-renames") return Discourse::Utils.execute_command("git", "diff", "--staged", "--diff-filter=r")
end end
ensure ensure
FileUtils.rm_rf local_temp_folder if local_temp_folder FileUtils.rm_rf local_temp_folder if local_temp_folder