haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libgit2-1.8.0 compatibility: adjusted parent pointer type 

- Adjusted parent pointer type in git_commit_create call for compatibility
  with libgit2 1.8.0 and above.
- Included preprocessor checks to maintain support for versions older than
  1.8.0.
- Ensures consistent function behavior across different libgit2 versions.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/17536
Signed-off-by: Huang Rui <vowstar@gmail.com>


(cherry picked from commit 1cbf6a1872)
This commit is contained in:
Huang Rui 2024-03-22 18:18:40 +08:00 committed by dsa-t
parent f7765ea5b9
commit 7dc8527022
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kicad/project_tree_pane.cpp
View File

@ -2236,7 +2236,14 @@ void PROJECT_TREE_PANE::onGitCommit( wxCommandEvent& aEvent )
} }
git_oid oid; 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
git_commit* const parents[1] = { parent };
#else
// For libgit2 versions older than 1.8.0
const git_commit* parents[1] = { parent }; const git_commit* parents[1] = { parent };
#endif
if( git_commit_create( &oid, repo, "HEAD", author, author, nullptr, commit_msg.mb_str(), tree, if( git_commit_create( &oid, repo, "HEAD", author, author, nullptr, commit_msg.mb_str(), tree,
1, parents ) != 0 ) 1, parents ) != 0 )