fix add_entries

Author: SandrineP

src/subcommand/add_subcommand.cpp

@@ -34,11 +34,6 @@ void add_subcommand::run()
     }
     else
     {
-        for (const auto& path : add_files)
-        {
-            git_index_entry* entry;
-            entry->path = path.c_str();
-            index.add_entry(entry);
-        }
+        index.add_entry(add_files);
     }
 }

src/wrapper/index_wrapper.cpp

@@ -3,6 +3,7 @@
 #include "../wrapper/repository_wrapper.hpp"
 
 #include <iostream>
+#include <vector>
 
 index_wrapper::~index_wrapper()
 {
@@ -17,15 +18,23 @@ index_wrapper index_wrapper::init(repository_wrapper& rw)
     return index;
 }
 
-void index_wrapper::add_entry(const git_index_entry* entry)
+void index_wrapper::add_entries(std::vector<std::string> patterns)
 {
-    throwIfError(git_index_add(*this, entry));
+    add_impl(std::move(patterns));
 }
 
 void index_wrapper::add_all()
 {
-    const char* patterns[] = {"."};
-    git_strarray array{(char**)patterns, 1};
+    add_impl({{"."}});
+}
+
+void index_wrapper::add_impl(std::vector<std::string> patterns)
+{
+    git_strarray array{new char*[patterns.size()], patterns.size()};
+    for (size_t i=0; i<patterns.size(); ++i)
+    {
+        array.strings[i] = const_cast<char*>(patterns[i].c_str());
+    }
     throwIfError(git_index_add_all(*this, &array, 0, NULL, NULL));
     throwIfError(git_index_write(*this));
 }

src/wrapper/index_wrapper.hpp

@@ -1,5 +1,8 @@
 #pragma once
 
+#include <string>
+#include <vector>
+
 #include <git2.h>
 
 #include "../utils/common.hpp"
@@ -17,11 +20,12 @@ class index_wrapper : public wrapper_base<git_index>
 
     static index_wrapper init(repository_wrapper& rw);
 
-    void add_entry(const git_index_entry* entry);
+    void add_entries(std::vector<std::string> patterns);
     void add_all();
 
 
 private:
 
     index_wrapper() = default;
+    void add_impl(std::vector<std::string> patterns);
 };

test/test_add.py

@@ -4,15 +4,21 @@
 import pytest
 
 
-@pytest.mark.parametrize("all_flag", ["-A", "--all", "--no-ignore-removal"])
+@pytest.mark.parametrize("all_flag", ["", "-A", "--all", "--no-ignore-removal"])
 def test_add(git2cpp_path, all_flag):
     with open("./test/mook_file.txt", "x") as f:
         pass
     f.close()
 
+    with open("./test/mook_file_2.txt", "x") as f:
+        pass
+    f.close()
+
     cmd_add = [git2cpp_path, 'add']
     if all_flag != "":
         cmd_add.append(all_flag)
+    else:
+        cmd_add.append("test/mook_file.txt")
     subprocess.run(cmd_add, capture_output=True, text=True)
 
     cmd_status = [git2cpp_path, 'status', "--long"]
@@ -27,3 +33,5 @@ def test_add(git2cpp_path, all_flag):
     # assert "modified" in p.stdout
     #
     os.remove("./test/mook_file.txt")
+    os.remove("./test/mook_file_2.txt")
+    subprocess.run(cmd_add, capture_output=True, text=True)