Unverified Commit 50df425c authored by Emily's avatar Emily Committed by GitHub
Browse files

jujutsu: 0.27.0 -> 0.28.1 (#396202)

parents 42a1c966 b994d821
Loading
Loading
Loading
Loading
+0 −52
Original line number Diff line number Diff line
From b4f936ac302ee835aa274e4dd186b436781d5d2f Mon Sep 17 00:00:00 2001
From: Rui Chen <rui@chenrui.dev>
Date: Thu, 9 Jan 2025 09:51:47 -0500
Subject: [PATCH] chore(deps): update git2 to use libgit2 1.9

Signed-off-by: Rui Chen <rui@chenrui.dev>
---
 Cargo.lock | 8 ++++----
 Cargo.toml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 69398f4d6d..3ec8dfdacc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -913,9 +913,9 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "git2"
-version = "0.19.0"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
+checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
 dependencies = [
  "bitflags",
  "libc",
@@ -2109,9 +2109,9 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.17.0+1.8.1"
+version = "0.18.0+1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
+checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec"
 dependencies = [
  "cc",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index 0fc4393cb5..b955fd6aa1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,7 +46,7 @@ dirs = "5.0.1"
 dunce = "1.0.5"
 either = "1.13.0"
 futures = "0.3.31"
-git2 = { version = "0.19.0", features = [
+git2 = { version = "0.20.0", features = [
     # Do *not* disable this feature even if you'd like dynamic linking. Instead,
     # set the environment variable `LIBGIT2_NO_VENDOR=1` if dynamic linking must
     # be used (this will override the Cargo feature), and allow static linking
+3 −8
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@
}:

let
  version = "0.27.0";
  version = "0.28.1";
in

rustPlatform.buildRustPackage {
@@ -30,17 +30,12 @@ rustPlatform.buildRustPackage {
    owner = "jj-vcs";
    repo = "jj";
    tag = "v${version}";
    hash = "sha256-fBgJrSglH46+NHu3spk5mC51ASDHWnOoW6veKZ0R2YA=";
    hash = "sha256-LDMHMFg9fjEMi8I2Fc3TEyWMctqJurAbckubCgkkZiM=";
  };

  useFetchCargoVendor = true;

  cargoPatches = [
    # <https://github.com/jj-vcs/jj/pull/5315>
    ./libgit2-1.9.0.patch
  ];

  cargoHash = "sha256-35DJdAUXc2gb/EXECScwinSzzp7uaxFbUxedjqRGfj8=";
  cargoHash = "sha256-y/GQSzI7bVPieuAmQKdZY1qticmmRYibBtgXSEJ7dU4=";

  nativeBuildInputs = [
    installShellFiles