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

Yet another workaround for libgit2 API changes

This commit is contained in:
Jon Evans 2023-12-11 16:21:11 -05:00
parent 5fa274ead0
commit 873023f0c4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcbnew/git/kigit_pcb_merge.cpp
View File

@ -63,6 +63,8 @@ void KIGIT_PCB_MERGE::findSetDifferences( const BOARD_ITEM_SET& aAncestorSet, co
}
}
}
KIGIT_PCB_MERGE_DIFFERENCES KIGIT_PCB_MERGE::compareBoards( BOARD* aAncestor, BOARD* aOther )
{
KIGIT_PCB_MERGE_DIFFERENCES differences;
@ -75,9 +77,10 @@ KIGIT_PCB_MERGE_DIFFERENCES KIGIT_PCB_MERGE::compareBoards( BOARD* aAncestor, BO
return differences;
}
int KIGIT_PCB_MERGE::Merge()
{
git_repository* repo = git_merge_driver_source_repo( m_mergeDriver );
auto repo = const_cast<git_repository*>( git_merge_driver_source_repo( m_mergeDriver ) );
const git_index_entry* ancestor = git_merge_driver_source_ancestor( m_mergeDriver );
const git_index_entry* ours = git_merge_driver_source_ours( m_mergeDriver );
const git_index_entry* theirs = git_merge_driver_source_theirs( m_mergeDriver );
@ -177,4 +180,3 @@ std::unique_ptr<BOARD> readBoard( wxString& aFilename )
return board;
}