From 5cf5e735361e81f5a7cad806122f6f10c28a9745 Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Thu, 27 Jun 2019 13:01:09 -0400 Subject: [PATCH] FIX: copy local theme changes to correct temp folder when diffing updates to remote theme Previously, local changes were being copied to a subfolder, resulting in lots of false positive diff changes. --- lib/theme_store/git_importer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/theme_store/git_importer.rb b/lib/theme_store/git_importer.rb index 673e9a45945..cf44169ceb5 100644 --- a/lib/theme_store/git_importer.rb +++ b/lib/theme_store/git_importer.rb @@ -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")