Port the GIT_OPT_GET_OWNER_VALIDATION option to Python

appveyor.yml

@@ -35,7 +35,7 @@ build_script:
 # Clone, build and install libgit2
 - cmd: |
     set LIBGIT2=%APPVEYOR_BUILD_FOLDER%\venv
-    git clone --depth=1 -b v1.4.2 https://github.com/libgit2/libgit2.git libgit2
+    git clone --depth=1 -b v1.4.3 https://github.com/libgit2/libgit2.git libgit2
     cd libgit2
     cmake . -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="%LIBGIT2%" -G "%GENERATOR%"
     cmake --build . --target install

docs/install.rst

@@ -58,7 +58,7 @@ Python requirements (these are specified in ``setup.py``):
 - cffi 1.9.1+
 - cached-property
 
-Libgit2 **v1.4.x**; binary wheels already include libgit2, so you only need to
+Libgit2 **v1.4.3+**; binary wheels already include libgit2, so you only need to
 worry about this if you install the source package.
 
 Optional libgit2 dependecies to support ssh and https:

src/options.c

@@ -298,6 +298,7 @@ option(PyObject *self, PyObject *args)
         case GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION:
         case GIT_OPT_ENABLE_UNSAVED_INDEX_SAFETY:
         case GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS:
+        case GIT_OPT_SET_OWNER_VALIDATION:
         {
             PyObject *py_enabled;
             int enabled;
@@ -317,6 +318,18 @@ option(PyObject *self, PyObject *args)
             Py_RETURN_NONE;
         }
 
+        // int enabled getter
+        case GIT_OPT_GET_OWNER_VALIDATION:
+        {
+            int enabled;
+
+            error = git_libgit2_opts(option, &enabled);
+            if (error < 0)
+                return Error_set(error);
+
+            return PyLong_FromLong(enabled);
+        }
+
         // Not implemented
         case GIT_OPT_SET_SSL_CIPHERS:
         case GIT_OPT_GET_USER_AGENT:

src/options.h

@@ -51,6 +51,13 @@ PyDoc_STRVAR(option__doc__,
   "\n"
   "GIT_OPT_SET_MWINDOW_SIZE, size\n"
   "    Set the maximum mmap window size.\n"
+  "\n"
+  "GIT_OPT_GET_OWNER_VALIDATION\n"
+  "    Gets the owner validation setting for repository directories.\n"
+  "\n"
+  "GIT_OPT_SET_OWNER_VALIDATION, enabled\n"
+  "    Set that repository directories should be owned by the current user.\n"
+  "    The default is to validate ownership.\n"
   );
 
 

src/pygit2.c

@@ -329,6 +329,8 @@ PyInit__pygit2(void)
     ADD_CONSTANT_INT(m, GIT_OPT_GET_PACK_MAX_OBJECTS);
     ADD_CONSTANT_INT(m, GIT_OPT_SET_PACK_MAX_OBJECTS);
     ADD_CONSTANT_INT(m, GIT_OPT_DISABLE_PACK_KEEP_FILE_CHECKS);
+    ADD_CONSTANT_INT(m, GIT_OPT_GET_OWNER_VALIDATION);
+    ADD_CONSTANT_INT(m, GIT_OPT_SET_OWNER_VALIDATION);
 
     /* Exceptions */
     ADD_EXC(m, GitError, NULL);

test/test_options.py

@@ -111,3 +111,7 @@ def test_search_path_proxy():
     for level, path in paths:
         pygit2.settings.search_path[level] = path
         assert path == pygit2.settings.search_path[level]
+
+def test_owner_validation():
+    __option(pygit2.GIT_OPT_GET_OWNER_VALIDATION,
+             pygit2.GIT_OPT_SET_OWNER_VALIDATION, 0)