Fix git commands

Changed files were not retrieved properly in latest git versions.
sportradar · Oct 4, 2024 · f45466f · f45466f
1 parent 5bcd78c
commit f45466f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/workspace/lib/workspace/git.ex b/workspace/lib/workspace/git.ex
@@ -86,7 +86,7 @@ defmodule Workspace.Git do
   def uncommitted_files(opts \\ []) do
     cd = opts[:cd] || File.cwd!()
 
-    with {:ok, output} <- git_in_path(cd, ~w[diff --name-only --no-renames HEAD .]) do
+    with {:ok, output} <- git_in_path(cd, ~w[diff --name-only --no-renames HEAD]) do
       {:ok, parse_git_output(output)}
     end
   end
@@ -120,7 +120,14 @@ defmodule Workspace.Git do
     cd = opts[:cd] || File.cwd!()
 
     with {:ok, output} <-
-           git_in_path(cd, ["diff", "--name-only", "--no-renames", "--relative", base, head]) do
+           git_in_path(cd, [
+             "diff",
+             "--name-only",
+             "--no-renames",
+             "--relative",
+             "#{base}",
+             "#{head}"
+           ]) do
       {:ok, parse_git_output(output)}
     end
   end

diff --git a/workspace/test/support/test_utils.ex b/workspace/test/support/test_utils.ex
@@ -188,9 +188,9 @@ defmodule Workspace.TestUtils do
   def init_git_project(path) do
     File.cd!(path, fn ->
       System.cmd("git", ~w[init])
+      System.cmd("git", ~w[symbolic-ref HEAD refs/heads/main])
       System.cmd("git", ~w[add .])
       System.cmd("git", ~w[commit -m "commit"])
-      System.cmd("git", ~w[symbolic-ref HEAD refs/heads/main])
     end)
   end