pygit2 1.20.0__tar.gz → 1.20.1__tar.gz

{pygit2-1.20.0 → pygit2-1.20.1}/AGENTS.md

@@ -11,7 +11,7 @@ and a high-level, Pythonic API for repository manipulation.
 - **License**: GPLv2 with linking exception (see `COPYING`)
 - **Maintainer**: J. David Ibáñez
 - **Python Support**: 3.11 – 3.14 and PyPy3 7.3+
-- **libgit2 Version**: 1.9.6
+- **libgit2 Version**: 1.9.7
 - **Homepage**: <https://www.pygit2.org/>
 - **Repository**: <https://github.com/libgit2/pygit2>
 
@@ -107,7 +107,7 @@ handles libgit2 compilation via CMake.
 make
 
 # Or manually:
-LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.6 sh build.sh
+LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.7 sh build.sh
 
 # Build a wheel and bundle the shared libraries into it
 sh build.sh wheel
@@ -139,8 +139,8 @@ Variables consumed by `build.sh`:
 
 - `LIBGIT2_VERSION` — If set, download and build this libgit2 version.
 - `LIBSSH2_VERSION` — If set, download and build libssh2 with SSH support.
-- `OPENSSL_VERSION` — If set, download and build OpenSSL (mainly used for
-  macOS universal builds on CI).
+- `OPENSSL_VERSION` — If set, download and build OpenSSL (used on Linux and
+  macOS CI builds).
 - `ZLIB_VERSION` — If set, download and build zlib.
 - `BUILD_TYPE` — CMake build type (default: `Debug`).
 - `PYTHON` — Python interpreter to use (default: `python3`).
@@ -242,7 +242,8 @@ GitHub Actions workflows live in `.github/workflows/`:
   `sh build.sh mypy`.
 - **`wheels.yml`** — Uses `cibuildwheel` (`~=3.3`) to build wheels for Linux
   (amd64, arm64, ppc64le and riscv64 via QEMU, musl), macOS (intel, arm64,
-  PyPy), and Windows (x64, x86, arm64). It also builds an sdist, runs a
+  PyPy), and Windows (x64, x86, arm64). Linux, macOS and Windows jobs cache
+  the compiled dependencies between runs. It also builds an sdist, runs a
   `twine check` (skipped on version tags), publishes to PyPI, and creates a
   GitHub Release on version tags (`v*`), with release notes parsed from
   `CHANGELOG.md` by `.github/workflows/parse_release_notes.py`.
@@ -250,7 +251,7 @@ GitHub Actions workflows live in `.github/workflows/`:
 
 The `cibuildwheel` configuration in `pyproject.toml` pins:
 
-- `LIBGIT2_VERSION="1.9.6"`
+- `LIBGIT2_VERSION="1.9.7"`
 - `LIBSSH2_VERSION="1.11.1"`
 - `OPENSSL_VERSION="3.5.7"`
 
@@ -272,6 +273,7 @@ and skips `*musllinux_ppc64le` plus testing on `*-*linux_ppc64le`,
 
 ## Git Commits
 
+- Do not run `git commit` or create commits unless the user explicitly asks for it.
 - Commits created by an AI agent must end with the `Assisted-by:` trailer.
   Human-authored commits do not need it.
 

{pygit2-1.20.0 → pygit2-1.20.1}/AUTHORS.md

@@ -126,6 +126,7 @@ Authors:
     Marcel Waldvogel
     Masud Rahman
     Michael Sondergaard
+    Michal Koutný
     Natanael Arndt
     Nick Williams
     Ondřej Nový
@@ -201,6 +202,7 @@ Authors:
     Lance Eftink
     Legorooj
     Lukas Berk
+    Marius Gedminas
     Martin von Zweigbergk
     Mathieu Bridon
     Mathieu Pillard
@@ -227,6 +229,7 @@ Authors:
     Remy Suen
     Ridge Kennedy
     Rodrigo Bistolfi
+    Roshan Ramani
     Ross Nicoll
     Rui Abreu Ferreira
     Rui Chen

{pygit2-1.20.0 → pygit2-1.20.1}/CHANGELOG.md

@@ -1,3 +1,44 @@
+# 1.20.1 (2026-09-12)
+
+- Update wheels to libgit2 1.9.7
+
+- New exception hierarchy: `AlreadyExistsError`, `InvalidSpecError`,
+  `InvalidError`, `NotFoundError`, `AmbiguousError`, `AuthError`, and
+  `CertificateError` all inherit from `GitError` and the appropriate Python
+  built-in exception (`ValueError`/`KeyError`) for backward compatibility
+  [#830](https://github.com/libgit2/pygit2/issues/830)
+
+- Fix `DiffDelta.is_binary` and `DiffDelta.flags` returning stale values for
+  deltas obtained from `Diff.deltas`; flags are now loaded lazily
+  [#962](https://github.com/libgit2/pygit2/issues/962)
+  [#1100](https://github.com/libgit2/pygit2/pull/1100)
+
+- Fix `repo.submodules.get()` and `name in repo.submodules` raising
+  `AlreadyExistsError` when a repository exists at the submodule path but was
+  never registered as a submodule; they now return `None` and `False`
+  respectively as documented
+  [#1487](https://github.com/libgit2/pygit2/pull/1487)
+
+- Fix `BlobIO` cleanup deadlock on partial reads
+  [#1488](https://github.com/libgit2/pygit2/issues/1488)
+  [#1491](https://github.com/libgit2/pygit2/pull/1491)
+
+- Fix leaks and crashes in error paths
+  [#1478](https://github.com/libgit2/pygit2/issues/1478)
+  [#1479](https://github.com/libgit2/pygit2/issues/1479)
+  [#1480](https://github.com/libgit2/pygit2/issues/1480)
+  [#1481](https://github.com/libgit2/pygit2/issues/1481)
+
+- Fix custom ODB and refdb backend callbacks overwriting a pending Python
+  exception (e.g. `RuntimeError`) with a stale libgit2 error message.
+
+- Documentation fixes
+  [#1490](https://github.com/libgit2/pygit2/pull/1490)
+
+- CI (macOS): build architecture-specific OpenSSL/libssh2/libgit2
+  dependencies instead of universal binaries, producing smaller wheels.
+
+
 # 1.20.0 (2026-08-08)
 
 - New `RemoteCallbacks.custom_headers()`

{pygit2-1.20.0 → pygit2-1.20.1}/Makefile

@@ -1,7 +1,7 @@
 .PHONY: build html
 
 build:
-	OPENSSL_VERSION=3.5.7 LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.6 sh build.sh
+	OPENSSL_VERSION=3.5.7 LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.7 sh build.sh
 
 html: build
 	make -C docs html

{pygit2-1.20.0 → pygit2-1.20.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygit2
-Version: 1.20.0
+Version: 1.20.1
 Summary: Python bindings for libgit2.
 Home-page: https://github.com/libgit2/pygit2
 Maintainer: J. David Ibáñez

{pygit2-1.20.0 → pygit2-1.20.1}/SPONSORS.md

@@ -1,5 +1,7 @@
 Friends of pygit2:
 
+- [William Bowers](https://github.com/ralian)
+
 - Add your name to the list,
   [become a friend of pygit2](https://github.com/sponsors/jdavid).
 

pygit2-1.20.1/build.ps1

@@ -0,0 +1,51 @@
+$ErrorActionPreference = 'Stop'
+
+$LIBGIT2_VERSION = $env:LIBGIT2_VERSION
+$LIBGIT2_SRC = $env:LIBGIT2_SRC
+if (-not $LIBGIT2_SRC) {
+    $LIBGIT2_SRC = "build/libgit2_src"
+}
+
+# Prefer CMAKE_INSTALL_PREFIX, then LIBGIT2, then the default Program Files location.
+$INSTALL_PREFIX = $env:CMAKE_INSTALL_PREFIX
+if (-not $INSTALL_PREFIX) {
+    $INSTALL_PREFIX = $env:LIBGIT2
+}
+if (-not $INSTALL_PREFIX) {
+    $INSTALL_PREFIX = "$env:ProgramFiles\libgit2"
+}
+
+# Use cached dependencies if they match the requested version.
+if ((Test-Path -Path "$INSTALL_PREFIX\versions.txt") -and $LIBGIT2_VERSION) {
+    $cached = Get-Content "$INSTALL_PREFIX\versions.txt"
+    $matches = $cached | Select-String "^LIBGIT2_VERSION=$LIBGIT2_VERSION$"
+    if ($matches) {
+        Write-Host "Using cached dependencies"
+        exit 0
+    }
+}
+
+if (!(Test-Path -Path "build")) {
+    # in case the pygit2 package build/ workspace has not been created by cibuildwheel yet
+    mkdir build
+}
+if (Test-Path -Path "$LIBGIT2_SRC") {
+    Set-Location "$LIBGIT2_SRC"
+    # for local runs, reuse build/libgit_src if it exists
+    if (Test-Path -Path build) {
+        # purge previous build env (likely for a different arch type)
+        Remove-Item -Recurse -Force build
+    }
+    # ensure we are checked out to the right version
+    git fetch --depth=1 --tags
+    git checkout "v$LIBGIT2_VERSION"
+} else {
+    # from a fresh run (like in CI)
+    git clone --depth=1 -b "v$LIBGIT2_VERSION" https://github.com/libgit2/libgit2.git $LIBGIT2_SRC
+    Set-Location "$LIBGIT2_SRC"
+}
+cmake -B build -S . -DBUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX="$INSTALL_PREFIX"
+cmake --build build/ --config=Release --target install
+
+# Record version so the cache can be reused.
+"LIBGIT2_VERSION=$LIBGIT2_VERSION" | Set-Content "$INSTALL_PREFIX\versions.txt" -NoNewline

{pygit2-1.20.0 → pygit2-1.20.1}/build.sh

@@ -14,7 +14,7 @@
 #   LIBSSH2_VERSION=<Version> - Build the given version of libssh2
 #   LIBGIT2_VERSION=<Version> - Build the given version of libgit2
 #   OPENSSL_VERSION=<Version> - Build the given version of OpenSSL
-#                               (only needed for Mac universal on CI)
+#                               (used on Linux and macOS CI builds)
 #
 # Examples.
 #
@@ -22,14 +22,14 @@
 #
 #   sh build.sh
 #
-# Build libgit2 1.9.6 (will use libssh2 if available), then build pygit2
+# Build libgit2 1.9.7 (will use libssh2 if available), then build pygit2
 # inplace:
 #
-#   LIBGIT2_VERSION=1.9.6 sh build.sh
+#   LIBGIT2_VERSION=1.9.7 sh build.sh
 #
-# Build libssh2 1.11.1 and libgit2 1.9.6, then build pygit2 inplace:
+# Build libssh2 1.11.1 and libgit2 1.9.7, then build pygit2 inplace:
 #
-#   LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.6 sh build.sh
+#   LIBSSH2_VERSION=1.11.1 LIBGIT2_VERSION=1.9.7 sh build.sh
 #
 # Build inplace and run the tests:
 #
@@ -82,8 +82,20 @@ if [ "$CIBUILDWHEEL" = "1" ]; then
             apk add --no-cache perl
         fi
     fi
-    rm -rf ci
-    mkdir ci || true
+
+    # Use cached dependencies if they match the requested versions.
+    if [ -f ci/versions.txt ] && \
+       grep -q "^LIBGIT2_VERSION=$LIBGIT2_VERSION$" ci/versions.txt && \
+       grep -q "^LIBSSH2_VERSION=$LIBSSH2_VERSION$" ci/versions.txt && \
+       grep -q "^OPENSSL_VERSION=$OPENSSL_VERSION$" ci/versions.txt; then
+        echo "Using cached dependencies"
+        exit 0
+    fi
+
+    # The ci directory may be a bind-mount (e.g. inside cibuildwheel), so
+    # remove its contents but keep the directory itself.
+    rm -rf ci/* ci/.[!.]* ci/..?* 2>/dev/null || true
+    mkdir -p ci
     cd ci
 else
     # Create a virtual environment
@@ -110,31 +122,24 @@ if [ -n "$OPENSSL_VERSION" ]; then
     wget https://www.openssl.org/source/$FILENAME.tar.gz -N --no-check-certificate
 
     if [ "$KERNEL" = "Darwin" ]; then
+        # Build OpenSSL for the host architecture only.
         tar xf $FILENAME.tar.gz
-        mv $FILENAME openssl-x86
-
-        tar xf $FILENAME.tar.gz
-        mv $FILENAME openssl-arm
-
-        cd openssl-x86
-        ./Configure darwin64-x86_64-cc shared
-        make
-        cd ../openssl-arm
-        ./Configure enable-rc5 zlib darwin64-arm64-cc no-asm
+        cd $FILENAME
+        if [ "$ARCH" = "arm64" ]; then
+            ./Configure enable-rc5 zlib darwin64-arm64-cc no-asm shared --prefix=$PREFIX --libdir=$PREFIX/lib
+        else
+            ./Configure darwin64-x86_64-cc shared --prefix=$PREFIX --libdir=$PREFIX/lib
+        fi
         make
-        cd ..
-
-        mkdir openssl-universal
-
-        LIBSSL=$(basename openssl-x86/libssl.*.dylib)
-        lipo -create openssl-x86/libssl.*.dylib openssl-arm/libssl.*.dylib -output openssl-universal/$LIBSSL
-        LIBCRYPTO=$(basename openssl-x86/libcrypto.*.dylib)
-        lipo -create openssl-x86/libcrypto.*.dylib openssl-arm/libcrypto.*.dylib -output openssl-universal/$LIBCRYPTO
-        cd openssl-universal
-        install_name_tool -id "@rpath/$LIBSSL" $LIBSSL
-        install_name_tool -id "@rpath/$LIBCRYPTO" $LIBCRYPTO
-        OPENSSL_PREFIX=$(pwd)
-        cd ..
+        make install
+        OPENSSL_PREFIX=$PREFIX
+        # Set install names so delocate can bundle the libraries.
+        cd $PREFIX/lib
+        LIBSSL=$(find . -maxdepth 1 -name 'libssl.*.dylib' -type f | head -n1 | sed 's|^\./||')
+        LIBCRYPTO=$(find . -maxdepth 1 -name 'libcrypto.*.dylib' -type f | head -n1 | sed 's|^\./||')
+        install_name_tool -id "@rpath/$LIBSSL" "$LIBSSL"
+        install_name_tool -id "@rpath/$LIBCRYPTO" "$LIBCRYPTO"
+        cd ../..
     else
         # Linux
         tar xf $FILENAME.tar.gz
@@ -154,14 +159,11 @@ if [ -n "$LIBSSH2_VERSION" ]; then
     tar xf $FILENAME.tar.gz
     cd $FILENAME
     if [ "$KERNEL" = "Darwin" ] && [ "$CIBUILDWHEEL" = "1" ]; then
-        cmake . \
+        CMAKE_PREFIX_PATH=$PREFIX cmake . \
                 -DCMAKE_INSTALL_PREFIX=$PREFIX \
                 -DBUILD_SHARED_LIBS=ON \
                 -DBUILD_EXAMPLES=OFF \
-                -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
-                -DOPENSSL_CRYPTO_LIBRARY="../openssl-universal/$LIBCRYPTO" \
-                -DOPENSSL_SSL_LIBRARY="../openssl-universal/$LIBSSL" \
-                -DOPENSSL_INCLUDE_DIR="../openssl-x86/include" \
+                -DCMAKE_OSX_ARCHITECTURES="$ARCH" \
                 -DBUILD_TESTING=OFF
     else
         cmake . \
@@ -186,14 +188,11 @@ if [ -n "$LIBGIT2_VERSION" ]; then
     mkdir -p build
     cd build
     if [ "$KERNEL" = "Darwin" ] && [ "$CIBUILDWHEEL" = "1" ]; then
-        CMAKE_PREFIX_PATH=$OPENSSL_PREFIX:$PREFIX cmake .. \
+        CMAKE_PREFIX_PATH=$PREFIX cmake .. \
                 -DBUILD_SHARED_LIBS=ON \
                 -DBUILD_TESTS=OFF \
                 -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
-                -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
-                -DOPENSSL_CRYPTO_LIBRARY="../openssl-universal/$LIBCRYPTO" \
-                -DOPENSSL_SSL_LIBRARY="../openssl-universal/$LIBSSL" \
-                -DOPENSSL_INCLUDE_DIR="../openssl-x86/include" \
+                -DCMAKE_OSX_ARCHITECTURES="$ARCH" \
                 -DCMAKE_INSTALL_PREFIX=$PREFIX \
                 -DUSE_SSH=$USE_SSH
     else
@@ -212,9 +211,13 @@ if [ -n "$LIBGIT2_VERSION" ]; then
 fi
 
 if [ "$CIBUILDWHEEL" = "1" ]; then
+    # Record versions so the cache can be reused.
+    cat > $PREFIX/versions.txt <<EOF
+LIBGIT2_VERSION=$LIBGIT2_VERSION
+LIBSSH2_VERSION=$LIBSSH2_VERSION
+OPENSSL_VERSION=$OPENSSL_VERSION
+EOF
     if [ "$KERNEL" = "Darwin" ]; then
-        cp $OPENSSL_PREFIX/*.dylib $PREFIX/lib/
-        cp $OPENSSL_PREFIX/*.dylib $PREFIX/lib/
         echo "PREFIX        " $PREFIX
         echo "OPENSSL_PREFIX" $OPENSSL_PREFIX
         ls -l $PREFIX

{pygit2-1.20.0 → pygit2-1.20.1}/pygit2/__init__.py

@@ -248,7 +248,6 @@ from ._pygit2 import (
     LIBGIT2_VER_MINOR,
     LIBGIT2_VER_REVISION,
     LIBGIT2_VERSION,
-    AlreadyExistsError,
     Blob,
     Branch,
     Commit,
@@ -259,8 +258,6 @@ from ._pygit2 import (
     DiffLine,
     DiffStats,
     FilterSource,
-    GitError,
-    InvalidSpecError,
     Mailmap,
     Note,
     Object,
@@ -306,7 +303,18 @@ from .callbacks import (
 )
 from .config import Config
 from .credentials import *
-from .errors import Passthrough, check_error
+from .errors import (
+    AlreadyExistsError,
+    AmbiguousError,
+    AuthError,
+    CertificateError,
+    GitError,
+    InvalidError,
+    InvalidSpecError,
+    NotFoundError,
+    Passthrough,
+    check_error,
+)
 from .ffi import C, ffi
 from .filter import Filter
 from .index import Index, IndexEntry
@@ -592,8 +600,11 @@ __all__ = (
     'Object',
     'Reference',
     'AlreadyExistsError',
+    'AmbiguousError',
+    'AuthError',
     'Blob',
     'Branch',
+    'CertificateError',
     'Commit',
     'Diff',
     'DiffDelta',
@@ -602,9 +613,11 @@ __all__ = (
     'DiffLine',
     'DiffStats',
     'GitError',
+    'InvalidError',
     'InvalidSpecError',
     'Mailmap',
     'Note',
+    'NotFoundError',
     'Odb',
     'OdbBackend',
     'OdbBackendLoose',

{pygit2-1.20.0 → pygit2-1.20.1}/pygit2/_build.py

@@ -34,7 +34,7 @@ from pathlib import Path
 #
 # The version number of pygit2
 #
-__version__ = '1.20.0'
+__version__ = '1.20.1'
 
 
 #

{pygit2-1.20.0 → pygit2-1.20.1}/pygit2/_pygit2.pyi

@@ -331,7 +331,10 @@ class Reference:
     def __lt__(self, other, /) -> bool: ...
     def __ne__(self, other, /) -> bool: ...
 
-class AlreadyExistsError(ValueError): ...
+class AlreadyExistsError(GitError, ValueError): ...
+class AmbiguousError(GitError, ValueError): ...
+class AuthError(GitError): ...
+class InvalidError(GitError, ValueError): ...
 
 @final
 class Blob(Object):
@@ -376,6 +379,8 @@ class Branch(Reference):  # type: ignore[misc]
     def is_head(self) -> bool: ...
     def rename(self, name: str, force: bool = False) -> 'Branch': ...  # type: ignore[override]
 
+class CertificateError(GitError): ...
+
 @final
 class Commit(_ObjectBase[GitCommitC]):
     _pointer: _Pointer[GitCommitC]
@@ -421,7 +426,7 @@ class Diff:
 @final
 class DiffDelta:
     flags: DiffFlag
-    is_binary: bool
+    is_binary: bool | None
     nfiles: int
     new_file: DiffFile
     old_file: DiffFile
@@ -476,7 +481,7 @@ class FilterSource:
     flags: int
 
 class GitError(Exception): ...
-class InvalidSpecError(ValueError): ...
+class InvalidSpecError(GitError, ValueError): ...
 
 @final
 class Mailmap:
@@ -505,6 +510,8 @@ class Note:
         self, author: Signature, committer: Signature, ref: str = 'refs/notes/commits'
     ) -> None: ...
 
+class NotFoundError(GitError, KeyError): ...
+
 @final
 class Odb:
     backends: Iterator[OdbBackend]

{pygit2-1.20.0 → pygit2-1.20.1}/pygit2/blob.py

@@ -86,10 +86,20 @@ class _BlobIO(io.RawIOBase):
 
     def close(self) -> None:
         try:
-            self._ready.wait()
-            self._writer_closed.wait()
-            while self._queue is not None and not self._queue.empty():
-                self._queue.get()
+            # The writer thread may be blocked in queue.put() because the
+            # queue (maxsize=1) still holds a chunk that was never consumed
+            # (e.g. the reader stopped before reaching EOF). Draining the
+            # queue must happen *before* (not after) waiting for
+            # `_writer_closed`, otherwise the writer can never make progress
+            # to reach its close callback and this would deadlock.
+            while True:
+                self._ready.wait()
+                while self._queue is not None and not self._queue.empty():
+                    self._queue.get()
+                if self._writer_closed.is_set():
+                    # Done
+                    break
+                self._ready.clear()
             self._thread.join()
         except KeyboardInterrupt:
             pass

{pygit2-1.20.0 → pygit2-1.20.1}/pygit2/errors.py

@@ -24,12 +24,39 @@
 # Boston, MA 02110-1301, USA.
 
 # Import from pygit2
-from ._pygit2 import GitError
+from ._pygit2 import (
+    AlreadyExistsError,
+    AmbiguousError,
+    AuthError,
+    CertificateError,
+    GitError,
+    InvalidError,
+    InvalidSpecError,
+    NotFoundError,
+)
 from .ffi import C, ffi
 
-__all__ = ['GitError']
+__all__ = [
+    'AlreadyExistsError',
+    'AmbiguousError',
+    'AuthError',
+    'CertificateError',
+    'GitError',
+    'InvalidError',
+    'InvalidSpecError',
+    'NotFoundError',
+    'Passthrough',
+]
 
-value_errors = set([C.GIT_EEXISTS, C.GIT_EINVALIDSPEC, C.GIT_EAMBIGUOUS])
+# Docstrings for C-defined exception classes
+GitError.__doc__ = 'Generic libgit2 error.'
+AlreadyExistsError.__doc__ = 'Object already exists.'
+InvalidSpecError.__doc__ = 'Invalid name/ref spec.'
+NotFoundError.__doc__ = 'Requested object could not be found.'
+AmbiguousError.__doc__ = 'More than one object matches.'
+AuthError.__doc__ = 'Authentication error.'
+CertificateError.__doc__ = 'Server certificate is invalid.'
+InvalidError.__doc__ = 'Invalid operation or input.'
 
 
 def check_error(err: int, io: bool = False) -> None:
@@ -48,17 +75,32 @@ def check_error(err: int, io: bool = False) -> None:
         message = f'err {err} (no message provided)'
 
     # Translate to Python errors
-    if err in value_errors:
+    if err == C.GIT_EEXISTS:
+        raise AlreadyExistsError(message)
+
+    if err == C.GIT_EINVALIDSPEC:
+        raise InvalidSpecError(message)
+
+    if err == C.GIT_EINVALID:
+        raise InvalidError(message)
+
+    if err == C.GIT_EAMBIGUOUS:
+        raise AmbiguousError(message)
+
+    if err == C.GIT_EBUFS:
         raise ValueError(message)
 
+    if err == C.GIT_EAUTH:
+        raise AuthError(message)
+
+    if err == C.GIT_ECERTIFICATE:
+        raise CertificateError(message)
+
     if err == C.GIT_ENOTFOUND:
         if io:
             raise IOError(message)
 
-        raise KeyError(message)
-
-    if err == C.GIT_EINVALIDSPEC:
-        raise ValueError(message)
+        raise NotFoundError(message)
 
     if err == C.GIT_ITEROVER:
         raise StopIteration()

{pygit2-1.20.0 → pygit2-1.20.1}/pygit2/submodules.py

@@ -32,7 +32,7 @@ from typing import TYPE_CHECKING, Optional
 from ._pygit2 import Oid
 from .callbacks import RemoteCallbacks, git_fetch_options
 from .enums import SubmoduleIgnore, SubmoduleStatus
-from .errors import check_error
+from .errors import AlreadyExistsError, check_error
 from .ffi import C, ffi
 from .utils import decode_fs_path, decode_string, encode_string
 
@@ -210,7 +210,11 @@ class SubmoduleCollection:
         """
         try:
             return self[name]
-        except KeyError:
+        except (KeyError, AlreadyExistsError):
+            # libgit2 reports GIT_EEXISTS, which check_error turns into
+            # AlreadyExistsError, when a repository exists at the path but was
+            # never registered as a submodule. There is still no submodule by
+            # that name, so report it the same way as a missing one.
             return None
 
     def add(

{pygit2-1.20.0 → pygit2-1.20.1}/pyproject.toml

@@ -9,7 +9,7 @@ skip = "*musllinux_ppc64le"
 archs = ["native"]
 build-frontend = "default"
 dependency-versions = "pinned"
-environment = {LIBGIT2="$(pwd)/ci", LIBGIT2_VERSION="1.9.6", LIBSSH2_VERSION="1.11.1", OPENSSL_VERSION="3.5.7"}
+environment = {LIBGIT2="$(pwd)/ci", LIBGIT2_VERSION="1.9.7", LIBSSH2_VERSION="1.11.1", OPENSSL_VERSION="3.5.7"}
 
 before-all = "sh build.sh"
 test-command = "pytest"
@@ -32,7 +32,7 @@ repair-wheel-command = "DYLD_LIBRARY_PATH={package}/ci/lib delocate-wheel --requ
 
 [tool.cibuildwheel.windows]
 environment.LIBGIT2_SRC = "build/libgit2_src"
-environment.LIBGIT2_VERSION = "1.9.6"
+environment.LIBGIT2_VERSION = "1.9.7"
 before-all = "powershell -File build.ps1"
 before-build = ""
 

{pygit2-1.20.0 → pygit2-1.20.1}/src/blob.c

@@ -190,6 +190,7 @@ static int blob_filter_stream_write(
             err = GIT_ERROR;
             goto done;
         }
+        Py_DECREF(result);
         pos += chunk_size;
     }
 
@@ -202,7 +203,7 @@ static int blob_filter_stream_close(git_writestream *s)
 {
     struct blob_filter_stream *stream = (struct blob_filter_stream *)s;
     PyGILState_STATE gil = PyGILState_Ensure();
-    PyObject *result;
+    PyObject *result = NULL;
     int err = 0;
 
     /* Signal closed and then ready in that order so consumers can block on
@@ -214,6 +215,7 @@ static int blob_filter_stream_close(git_writestream *s)
         git_error_set(GIT_ERROR_OS, "failed to signal writer closed");
         err = GIT_ERROR;
     }
+    Py_XDECREF(result);
     result = PyObject_CallMethod(stream->py_ready, "set", NULL);
     if (result == NULL)
     {
@@ -221,6 +223,7 @@ static int blob_filter_stream_close(git_writestream *s)
         git_error_set(GIT_ERROR_OS, "failed to signal queue ready");
         err = GIT_ERROR;
     }
+    Py_XDECREF(result);
 
     PyGILState_Release(gil);
     return err;
@@ -316,9 +319,11 @@ Blob__write_to_queue(Blob *self, PyObject *args, PyObject *kwds)
     {
         if (py_oid != NULL && py_oid != Py_None)
         {
-            err = py_oid_to_git_oid(py_oid, &opts.attr_commit_id);
-            if (err < 0)
-                return Error_set(err);
+            size_t len = py_oid_to_git_oid(py_oid, &opts.attr_commit_id);
+            if (len == 0) {
+                git_blob_free(blob);
+                return NULL;
+            }
         }
 
         if ((opts.flags & GIT_BLOB_FILTER_NO_SYSTEM_ATTRIBUTES) != 0)