Decouple GitKit: restore the libgit2 fork (fixes red main), keep the sqlite3 layering

Package.swift

@@ -286,13 +286,13 @@ let package = Package(
                           "LZMASupport",
                           "ZstdSupport"]),
 
-        // libgit2, packaged for SwiftPM by Cocoanetics/GitKit: a pristine
-        // libgit2 submodule compiled directly, exposing the curated,
-        // Windows-safe C module `CGitKit` (the git2.h API). GitKit's version
-        // tracks libgit2's 1:1 (1.9.4 ⇒ libgit2 v1.9.4). This replaces our
-        // former odrobnik/libgit2 fork pin; GitKit covers all five CI platforms.
-        .package(url: "https://github.com/Cocoanetics/GitKit",
-                 from: "1.9.4"),
+        // libgit2 1.9.x packaged as a SwiftPM C target. We pin to our
+        // own fork while https://github.com/ibrahimcetin/libgit2/pull/<TBD>
+        // is open — it adds Windows + Android arms to Package.swift so
+        // the SwiftPM build covers all five of our CI platforms. Roll
+        // back to upstream once the PR lands.
+        .package(url: "https://github.com/odrobnik/libgit2",
+                 branch: "windows-android-platforms"),
 
         // ShellKit owns the virtualised shell-environment surface
         // (IO sinks, Environment, Sandbox URL gate, NetworkConfig,
@@ -936,7 +936,7 @@ let package = Package(
         .target(
             name: "CLibgit2Shim",
             dependencies: [
-                .product(name: "CGitKit", package: "GitKit"),
+                .product(name: "libgit2", package: "libgit2"),
             ],
             path: "Sources/CLibgit2Shim",
             publicHeadersPath: "include"
@@ -949,7 +949,7 @@ let package = Package(
                 "CLibgit2Shim",
                 "ForgeKit",
                 .product(name: "ShellKit", package: "ShellKit"),
-                .product(name: "CGitKit", package: "GitKit"),
+                .product(name: "libgit2", package: "libgit2"),
                 // For `git archive` — libarchive's writer is the
                 // backend so the operation runs in-process and works
                 // under sandboxed iOS / tvOS / watchOS.
@@ -964,7 +964,7 @@ let package = Package(
                 "ForgeKit",
                 .product(name: "ShellKit", package: "ShellKit"),
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
-                .product(name: "CGitKit", package: "GitKit"),
+                .product(name: "libgit2", package: "libgit2"),
             ],
             path: "Sources/SwiftGit/GitCommand"
         ),

Sources/SwiftGit/GitCommand/Subcommands/Stash/StashPush.swift

@@ -1,7 +1,7 @@
 import ArgumentParser
 import ShellKit
 import SwiftGit
-import CGitKit
+import libgit2
 
 struct StashPush: AsyncParsableCommand {
     static let configuration = CommandConfiguration(

Sources/SwiftGit/GitCommand/VersionCommand.swift

@@ -1,6 +1,6 @@
 import ArgumentParser
 import ShellKit
-import CGitKit
+import libgit2
 
 struct VersionCommand: ParsableCommand {
     static let configuration = CommandConfiguration(

Sources/SwiftGit/Lib/CallbacksPayload.swift

@@ -1,5 +1,5 @@
 import Foundation
-import CGitKit
+import libgit2
 
 /// Combined heap-allocated box held by every libgit2 callback during a
 /// fetch/clone/push. libgit2's `git_remote_callbacks` has one `payload`

Sources/SwiftGit/Lib/Credentials.swift

@@ -1,5 +1,5 @@
 import Foundation
-import CGitKit
+import libgit2
 
 /// What an auth challenge is asking for. Mirrors libgit2's
 /// `GIT_CREDENTIAL_*` flags. The transport may permit several at once

Sources/SwiftGit/Lib/CredentialsBridge.swift

@@ -1,5 +1,5 @@
 import Foundation
-import CGitKit
+import libgit2
 
 /// Heap-allocated box holding the Swift `CredentialProvider`. We pass a
 /// raw pointer to this box as libgit2's `payload`, then unbox it inside

Sources/SwiftGit/Lib/GitClient+Apply.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 
 /// Where to land an applied patch. Mirrors libgit2's
 /// `git_apply_location_t` 1:1.

Sources/SwiftGit/Lib/GitClient+Archive.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ShellKit
-import CGitKit
+import libgit2
 
 // Selective imports — the libarchive wrapper module is named `Archive`
 // and its own `enum Archive` / `ArchiveFormat` / `ArchiveFilter` would

Sources/SwiftGit/Lib/GitClient+Blame.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 
 /// One hunk returned by ``GitClient/blame(path:)``. Each line in a
 /// blamed file falls into exactly one hunk; `linesInHunk` tells you

Sources/SwiftGit/Lib/GitClient+CatFile.swift

@@ -1,5 +1,5 @@
 import Foundation
-import CGitKit
+import libgit2
 
 /// Compact metadata about a git object — what `cat-file -t/-s/-e` reads.
 public struct ObjectMetadata: Sendable {

Sources/SwiftGit/Lib/GitClient+Checkout.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 
 /// What `git checkout -b` did. Real git distinguishes "switched to a
 /// new branch 'X'" (created fresh) from "switched to and reset

Sources/SwiftGit/Lib/GitClient+CherryPick.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 
 /// Result of a `git cherry-pick`.
 public enum CherryPickOutcome: Sendable {

Sources/SwiftGit/Lib/GitClient+Config.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 
 /// Where to read/write a config entry. Mirrors `git config`'s scope flags.
 public enum ConfigScope: Sendable {

Sources/SwiftGit/Lib/GitClient+Describe.swift

@@ -1,5 +1,5 @@
 import Foundation
-import CGitKit
+import libgit2
 
 extension GitClient {
 

Sources/SwiftGit/Lib/GitClient+Diff.swift

@@ -1,5 +1,5 @@
 import Foundation
-import CGitKit
+import libgit2
 
 /// Output mode for ``GitClient/diff(_:format:paths:contextLines:)``.
 public enum DiffFormat: Sendable {

Sources/SwiftGit/Lib/GitClient+Grep.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 
 extension GitClient {
 

Sources/SwiftGit/Lib/GitClient+Init.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ShellKit
-import CGitKit
+import libgit2
 
 extension GitClient {
 

Sources/SwiftGit/Lib/GitClient+Inspection.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ShellKit
-import CGitKit
+import libgit2
 
 /// Rich result returned by ``GitClient/commitDetailed(message:author:allowEmpty:)``.
 /// The CLI uses this to format `git commit`'s `[branch sha] message` line

Sources/SwiftGit/Lib/GitClient+Log.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 
 /// One commit returned by ``GitClient/log(query:)``.
 public struct LogEntry: Sendable {

Sources/SwiftGit/Lib/GitClient+Merge.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 
 /// What `git merge`'s fast-forward decision was. Mirrors libgit2's
 /// `git_merge_analysis_t` filtered through the user's `--ff` choice.

Sources/SwiftGit/Lib/GitClient+MvRm.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 import ShellKit
 
 extension GitClient {

Sources/SwiftGit/Lib/GitClient+Rebase.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 
 /// Result of a rebase invocation.
 public enum RebaseOutcome: Sendable {

Sources/SwiftGit/Lib/GitClient+Reflog.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 
 /// One entry in a ref's reflog. Refs have a per-ref reflog stored in
 /// `.git/logs/refs/heads/<branch>` (or `.git/logs/HEAD` for HEAD).

Sources/SwiftGit/Lib/GitClient+Reset.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 
 /// Mode for whole-tree resets. Mirrors libgit2's `git_reset_t` 1:1.
 public enum ResetMode: Sendable {

Sources/SwiftGit/Lib/GitClient+RevParse.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 
 extension GitClient {
 

Sources/SwiftGit/Lib/GitClient+Stash.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 
 /// Single entry returned by ``GitClient/stashList()``.
 public struct Libgit2StashEntry: Sendable {

Sources/SwiftGit/Lib/GitClient+Status.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 
 /// One entry in a `git status` report. We preserve both the index-side
 /// state (HEAD ↔ index) and the workdir-side state (index ↔ working

Sources/SwiftGit/Lib/GitClient+Tag.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ForgeKit
-import CGitKit
+import libgit2
 
 /// One entry returned by ``GitClient/tagList(pattern:)``. Annotated
 /// tags carry a `message` + `tagger`; lightweight tags don't.

Sources/SwiftGit/Lib/GitClient+Tree.swift

@@ -1,5 +1,5 @@
 import Foundation
-import CGitKit
+import libgit2
 
 /// One entry produced by `lsTree`. Mirrors a single line of `git
 /// ls-tree`'s default output: `<mode> <type> <sha>\t<name>`.

Sources/SwiftGit/Lib/GitClient.swift

@@ -1,7 +1,7 @@
 import Foundation
 import ForgeKit
 import ShellKit
-import CGitKit
+import libgit2
 
 /// In-process libgit2-backed implementation of
 /// ``ForgeKit/GitClient`` (the protocol). The simple name `GitClient`

Sources/SwiftGit/Lib/Libgit2.swift

@@ -1,5 +1,5 @@
 import Foundation
-import CGitKit
+import libgit2
 
 /// Process-wide libgit2 init / shutdown bookkeeping.
 ///

Sources/SwiftGit/Lib/Libgit2Error.swift

@@ -1,5 +1,5 @@
 import Foundation
-import CGitKit
+import libgit2
 
 /// Wraps a non-zero return code from a `git_*` C call.
 ///

Sources/SwiftGit/Lib/Libgit2Sandboxing.swift

@@ -1,7 +1,7 @@
 import Foundation
 import ShellKit
 import CLibgit2Shim
-import CGitKit
+import libgit2
 
 /// Bridges `Shell.current.environment.variables()` to libgit2's process-global option
 /// block. Keeps libgit2's own `getenv` calls inside its C internals

Sources/SwiftGit/Lib/ProgressReporter.swift

@@ -1,6 +1,6 @@
 import Foundation
 import ShellKit
-import CGitKit
+import libgit2
 
 /// Formats and emits `remote: …` / `Receiving objects: …` /
 /// `From <url>` / `<oldsha>..<newsha> <ref> -> <tracking>` lines to

Sources/SwiftGit/Lib/SignatureResolver.swift

@@ -1,7 +1,7 @@
 import Foundation
 import ForgeKit
 import ShellKit
-import CGitKit
+import libgit2
 
 /// Real-git-compatible identity resolution for commit author + committer.
 ///

Tests/SwiftGitTests/CredentialsTests.swift

@@ -1,6 +1,6 @@
 import Foundation
 import Testing
-import CGitKit
+import libgit2
 @testable import SwiftGit
 
 @Suite("Credentials bridge")

Tests/SwiftGitTests/Tier2EnvBridgeTests.swift

@@ -16,7 +16,7 @@
 #if os(macOS)
 import Foundation
 import Testing
-import CGitKit
+import libgit2
 import ShellKit
 @testable import SwiftGit