Fix inheritance for git_common

Avoids repo type pointer issues when casting from void

(cherry picked from commit 676dd4ceec)
This commit is contained in:
Seth Hillbrand
2025-03-16 18:04:47 -07:00
parent 28ba36129a
commit e1436d3597
14 changed files with 210 additions and 122 deletions
+1 -3
View File
@@ -25,8 +25,6 @@
#define _GIT_PULL_HANDLER_H_
#include <git/git_repo_mixin.h>
#include <git/git_progress.h>
#include <git/kicad_git_errors.h>
#include <vector>
#include <string>
@@ -65,7 +63,7 @@ struct ConflictData
};
class GIT_PULL_HANDLER : public KIGIT_ERRORS, public GIT_PROGRESS, public KIGIT_REPO_MIXIN
class GIT_PULL_HANDLER : public KIGIT_REPO_MIXIN
{
public:
GIT_PULL_HANDLER( KIGIT_COMMON* aCommon );