Use clone -b to avoid weird decryption sequencing (#420)

pluralsh · Sep 28, 2023 · 76cf3a8 · 76cf3a8
1 parent d580d23
commit 76cf3a8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
-erlang 23.3
+erlang 23.3.4.19
 elixir 1.11.4
diff --git a/lib/console/storage/git.ex b/lib/console/storage/git.ex
@@ -6,11 +6,10 @@ defmodule Console.Storage.Git do
   def init() do
     unless File.exists?(workspace()) do
       with {:ok, _} <- maybe_add_username(conf(:git_url)),
-           {:ok, _} <- cmd("git", ["clone", conf(:git_url), workspace()]),
+           {:ok, _} <- cmd("git", ["clone", "-b", branch(), conf(:git_url), workspace()]),
            {:ok, _} <- git("config", ["user.name", conf(:git_user_name)]),
            {:ok, _} <- git("config", ["user.email", conf(:git_user_email)]),
-           {:ok, _} <- Plural.unlock(),
-        do: git("checkout", [branch()])
+        do: Plural.unlock()
     else
       pull()
     end

diff --git a/lib/console/watchers/upgrade.ex b/lib/console/watchers/upgrade.ex
@@ -78,6 +78,7 @@ defmodule Console.Watchers.Upgrade do
     end
   end
 
+  def handle_info(:usage, %{upgrades: nil} = state), do: {:noreply, state}
   def handle_info(:usage, %{upgrades: upgrades} = state) do
     Logger.info "Collecting resource usage"
     with true <- Console.Deployer.leader?(),