git: vendor custom prerelease version of libgit2

jj-vcs · Jul 3, 2024 · 0388334 · 0388334
1 parent a840894
commit 0388334
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -47,7 +47,7 @@ dirs = "5.0.1"
 either = "1.13.0"
 esl01-renderdag = "0.3.0"
 futures = "0.3.30"
-git2 = "0.18.3"
+git2 = { git = "https://github.com/bnjmnt4n/git2-rs.git", rev = "8fd23a45f" }
 gix = { version = "0.63.0", default-features = false, features = [
     "index",
     "max-performance-safe",

diff --git a/flake.nix b/flake.nix
@@ -85,6 +85,9 @@
           ];
 
           cargoLock.lockFile = ./Cargo.lock;
+          cargoLock.outputHashes = {
+            "git2-0.18.3" = "sha256-3g7ajPfLfuPWh46rIa70wQRWLZ+jZXBApkyPlJULi/I=";
+          };
           nativeBuildInputs = with pkgs; [
             gzip
             installShellFiles

diff --git a/lib/src/git.rs b/lib/src/git.rs
@@ -1266,7 +1266,12 @@ pub fn fetch(
     tracing::debug!("remote.prune");
     remote.prune(None)?;
     tracing::debug!("remote.update_tips");
-    remote.update_tips(None, false, git2::AutotagOption::Unspecified, None)?;
+    remote.update_tips(
+        None,
+        git2::RemoteUpdateFlags::empty(),
+        git2::AutotagOption::Unspecified,
+        None,
+    )?;
     // TODO: We could make it optional to get the default branch since we only care
     // about it on clone.
     let mut default_branch = None;