Transfer responsibility for enforcing tag target type to Xgit.Repository.Plumbing.

lib/xgit/repository/in_memory.ex

@@ -106,12 +106,12 @@ defmodule Xgit.Repository.InMemory do
   defp verify_target(_state, "ref: " <> _), do: cover(:ok)
 
   defp verify_target(state, target) do
-    with {:object, %Object{} = object} <- {:object, get_object_imp(state, target)},
-         {:type, %{type: :commit}} <- {:type, object} do
-      :ok
+    object = get_object_imp(state, target)
+
+    if object == nil do
+      cover {:error, :target_not_found}
     else
-      {:object, nil} -> cover {:error, :target_not_found}
-      {:type, _} -> cover {:error, :target_not_commit}
+      cover :ok
     end
   end
 

lib/xgit/repository/on_disk.ex

@@ -444,12 +444,12 @@ defmodule Xgit.Repository.OnDisk do
   defp verify_target(_state, "ref: " <> _), do: cover(:ok)
 
   defp verify_target(state, target) do
-    with {:object, %Object{} = object} <- {:object, get_object_imp(state, target)},
-         {:type, %{type: :commit}} <- {:type, object} do
-      :ok
+    object = get_object_imp(state, target)
+
+    if object == {:error, :not_found} do
+      cover {:error, :target_not_found}
     else
-      {:object, {:error, :not_found}} -> cover {:error, :target_not_found}
-      {:type, _} -> cover {:error, :target_not_commit}
+      cover :ok
     end
   end
 

lib/xgit/repository/plumbing.ex

@@ -848,7 +848,7 @@ defmodule Xgit.Repository.Plumbing do
   @typedoc ~S"""
   Reason codes that can be returned by `update_ref/4`.
   """
-  @type update_ref_reason :: Storage.put_ref_reason()
+  @type update_ref_reason :: Storage.put_ref_reason() | :target_not_commit
 
   @doc ~S"""
   Update the object name stored in a ref.
@@ -878,6 +878,8 @@ defmodule Xgit.Repository.Plumbing do
 
   `:ok` if written successfully.
 
+  `{:error, :target_not_commit}` if the target object is not of type `commit`.
+
   Reason codes may also come from the following functions:
 
   * `Xgit.Repository.Storage.put_ref/3`
@@ -894,7 +896,7 @@ defmodule Xgit.Repository.Plumbing do
     if new_value == ObjectId.zero() do
       Storage.delete_ref(repository, name, repo_opts)
     else
-      Storage.put_ref(repository, %Ref{name: name, target: new_value}, repo_opts)
+      put_ref(repository, name, new_value, repo_opts)
     end
   end
 
@@ -922,6 +924,17 @@ defmodule Xgit.Repository.Plumbing do
     end
   end
 
+  defp put_ref(repository, name, new_value, repo_opts) do
+    with {:object, {:ok, %Object{type: type}}} <-
+           {:object, Storage.get_object(repository, new_value)},
+         {:type, :commit} <- {:type, type} do
+      Storage.put_ref(repository, %Ref{name: name, target: new_value}, repo_opts)
+    else
+      {:object, {:error, :not_found}} -> cover {:error, :target_not_found}
+      {:type, _} -> cover {:error, :target_not_commit}
+    end
+  end
+
   @typedoc ~S"""
   Reason codes that can be returned by `get_symbolic_ref/2`.
   """

lib/xgit/repository/storage.ex

@@ -313,7 +313,6 @@ defmodule Xgit.Repository.Storage do
           :invalid_ref
           | :cant_create_file
           | :target_not_found
-          | :target_not_commit
           | :old_target_not_matched
 
   @doc ~S"""
@@ -345,8 +344,6 @@ defmodule Xgit.Repository.Storage do
 
   `{:error, :target_not_found}` if the target object does not exist in the repository.
 
-  `{:error, :target_not_commit}` if the target object is not of type `commit`.
-
   `{:error, :old_target_not_matched}` if `old_target` was specified and the target ref points
   to a different object ID.
   """
@@ -396,9 +393,6 @@ defmodule Xgit.Repository.Storage do
   Should return `{:error, :target_not_found}` if the target object does not
   exist in the repository.
 
-  Should return `{:error, :target_not_commit}` if the target object is not
-  of type `commit`.
-
   Should return `{:error, :old_target_not_matched}` if `old_target` was specified and the
   target ref points to a different object ID.
   """

lib/xgit/repository/test/ref_test.ex

@@ -79,7 +79,7 @@ defmodule Xgit.Repository.Test.RefTest do
         object = %Object{type: :blob, content: @test_content, size: 13, id: @test_content_id}
         :ok = Storage.put_loose_object(repo, object)
 
-        assert {:error, :target_not_commit} =
+        assert :ok =
                  Storage.put_ref(repo, %Ref{
                    name: "refs/heads/master",
                    target: @test_content_id