diff '--color=auto' -ur kicad-8.0.5.orig/kicad/project_tree_pane.cpp kicad-8.0.5/kicad/project_tree_pane.cpp --- kicad-8.0.5.orig/kicad/project_tree_pane.cpp 2024-09-06 18:28:40.000000000 +0200 +++ kicad-8.0.5/kicad/project_tree_pane.cpp 2024-11-05 12:20:14.524026741 +0100 @@ -2240,12 +2240,19 @@ } git_oid oid; - // Check if the libgit2 library version is 1.8.0 or higher -#if( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 ) - // For libgit2 version 1.8.0 and above + +#if ( ( LIBGIT2_VER_MAJOR == 1 \ + && ( ( LIBGIT2_VER_MINOR == 8 \ + && ( LIBGIT2_VER_REVISION < 2 || LIBGIT2_VER_REVISION == 3 ) ) \ + || ( LIBGIT2_VER_MINOR > 8 ) ) ) \ + || LIBGIT2_VER_MAJOR > 1 ) + // For libgit2 versions 1.8.0, 1.8.1. + // This change was reverted for 1.8.2 + // This change was re-reverted for 1.8.3 + // This change was re-re-reverted for 1.8.4+ git_commit* const parents[1] = { parent }; #else - // For libgit2 versions older than 1.8.0 + // For libgit2 versions older than 1.8.0, or equal to 1.8.2/1.8.4 const git_commit* parents[1] = { parent }; #endif