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

Browse Source 
Renamed assets are quite noisy when checking whether a remote theme has local changes.
This commit is contained in:
Penar Musaraj
2019-11-05 11:52:04 -05:00
parent 014f19b6ea
commit ca6adfbdd6
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/theme_store/git_importer.rb
View File

@@ -40,7 +40,7 @@ class ThemeStore::GitImporter
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 # adding and diffing on staged so that we catch uploads
Discourse::Utils.execute_command("git", "add", "-A") Discourse::Utils.execute_command("git", "add", "-A")
return Discourse::Utils.execute_command("git", "diff", "--staged") return Discourse::Utils.execute_command("git", "diff", "--staged", "--no-renames")
end end
ensure ensure
FileUtils.rm_rf local_temp_folder if local_temp_folder FileUtils.rm_rf local_temp_folder if local_temp_folder

1
spec/models/remote_theme_spec.rb
View File

@@ -170,6 +170,7 @@ describe RemoteTheme do
@theme.save @theme.save
@theme.reload @theme.reload
expect(remote.diff_local_changes[:diff]).not_to include("similarity index 100%")
expect(remote.diff_local_changes[:diff]).to include("background-color: blue") expect(remote.diff_local_changes[:diff]).to include("background-color: blue")
end end
end end