Fixed depth=1 and depth=0

Author: JohanMabille

src/subcommand/clone_subcommand.cpp

@@ -34,7 +34,11 @@ void clone_subcommand::run()
     clone_opts.fetch_opts.depth = m_depth;
     clone_opts.bare = m_bare ? 1 : 0;
 
-
+    if (m_depth == 0)
+    {
+        std::cout << "fatal: depth 0 is not a positive number" << std::endl;
+        return;
+    }
 
     std::string short_name = m_directory;
     if (m_directory.empty())

src/wrapper/commit_wrapper.cpp

@@ -1,4 +1,5 @@
 #include "../wrapper/commit_wrapper.hpp"
+#include <iostream>
 
 commit_wrapper::commit_wrapper(git_commit* commit)
     : base_type(commit)
@@ -30,6 +31,7 @@ std::string commit_wrapper::commit_oid_tostr() const
 commit_list_wrapper commit_wrapper::get_parents_list() const
 {
     size_t parent_count = git_commit_parentcount(*this);
+    std::cout << "parent_count: " << parent_count << std::endl;
     std::vector<commit_wrapper> parents_list;
     parents_list.reserve(parent_count);
 

src/wrapper/repository_wrapper.cpp

@@ -285,10 +285,9 @@ void repository_wrapper::reset(const object_wrapper& target, git_reset_t reset_t
 
 size_t repository_wrapper::shallow_depth_from_head() const
 {
-    size_t depth = 0;
     if (!this->is_shallow())
     {
-        return depth;
+        return 0u;
     }
 
     std::string git_path = this->git_path();
@@ -307,44 +306,44 @@ size_t repository_wrapper::shallow_depth_from_head() const
         }
     }
 
-    if (boundaries_list.size()==0)
+    if (boundaries_list.size() == 0u)
     {
-        return depth;
+        return 0u;
     }
 
     commit_wrapper head_commit = this->find_commit("HEAD");
     commit_list_wrapper commits_list = head_commit.get_parents_list();
-    std::vector<size_t> depth_list(commits_list.size(), 0);
-    std::vector<size_t> final_depths(boundaries_list.size(), 0);
-    bool has_parent = commits_list.size() > 0;
+    std::vector<size_t> depth_list(commits_list.size(), 1u);
+    std::vector<size_t> final_depths(boundaries_list.size(), 1u);
+    bool has_parent = commits_list.size() > 0u;
     while (has_parent)
     {
         has_parent = false;
         std::vector<commit_wrapper> temp_commits_list;
         std::vector<size_t> temp_depth_list;
         commit_list_wrapper parent_list({});
 
-        for (size_t i = 0; i < commits_list.size(); i++)
+        for (size_t i = 0u; i < commits_list.size(); i++)
         {
             const commit_wrapper& commit = commits_list[i];
             size_t depth = depth_list[i];
             const git_oid& oid = commit.oid();
             bool is_boundary = std::find_if(boundaries_list.cbegin(), boundaries_list.cend(), [oid](const git_oid& val) {return git_oid_equal(&oid, &val);}) != boundaries_list.cend();
             if (is_boundary)
             {
-                final_depths.push_back(depth + 1);
+                final_depths.push_back(depth + 1u);
             }
             else
             {
                 parent_list = commit.get_parents_list();
-                if (parent_list.size() > 0)
+                if (parent_list.size() > 0u)
                 {
                     has_parent = true;
-                    for (size_t j = 0; parent_list.size(); j++)
+                    for (size_t j = 0u; parent_list.size(); j++)
                     {
                         const commit_wrapper& c = parent_list[j];
                         temp_commits_list.push_back(std::move(const_cast<commit_wrapper&>(c)));
-                        temp_depth_list.push_back(depth + 1);
+                        temp_depth_list.push_back(depth + 1u);
                     }
                 }
             }
@@ -353,7 +352,7 @@ size_t repository_wrapper::shallow_depth_from_head() const
         commits_list = commit_list_wrapper(std::move(temp_commits_list));
     }
 
-    depth = *std::max_element(final_depths.begin(), final_depths.end());
+    std::size_t depth = *std::max_element(final_depths.begin(), final_depths.end());
     return depth;
 }
 

test/test_remote.py

@@ -319,6 +319,11 @@ def test_fetch_default_origin(git2cpp_path, repo_with_remote):
 
 def test_fetch_depth(git2cpp_path, tmp_path, run_in_tmp_path):
     url = "https://github.com/xtensor-stack/xtl.git"
+
+    invalid_clone_cmd = [git2cpp_path, "clone", "--depth", "1", url]
+    p_invalid_clone = [git2cpp_path, "clone", "--depth", "0", url]
+    assert p_invalid_clone.returncode != 0
+
     clone_cmd = [git2cpp_path, "clone", "--depth", "1", url]
     p_clone = subprocess.run(clone_cmd, capture_output=True, cwd=tmp_path, text=True)
     assert p_clone.returncode == 0