diff options
author | Steffen Winter <steffen.winter@proton.me> | 2024-09-07 13:31:28 +0200 |
---|---|---|
committer | Steffen Winter <steffen.winter@proton.me> | 2024-09-07 13:31:28 +0200 |
commit | e85094b42282b98fb5ca3053f380022edcfd83f8 (patch) | |
tree | ccc366f7939f675c87587e26e924bee2634dc4b6 /dev-vcs/jj | |
parent | dev-vcs/jj: drop 0.20.0 (diff) | |
download | guru-e85094b42282b98fb5ca3053f380022edcfd83f8.tar.gz guru-e85094b42282b98fb5ca3053f380022edcfd83f8.tar.bz2 guru-e85094b42282b98fb5ca3053f380022edcfd83f8.zip |
dev-vcs/jj: Remove unused patch
Signed-off-by: Steffen Winter <steffen.winter@proton.me>
Diffstat (limited to 'dev-vcs/jj')
-rw-r--r-- | dev-vcs/jj/files/jj-0.20.0-bump-git2.patch | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/dev-vcs/jj/files/jj-0.20.0-bump-git2.patch b/dev-vcs/jj/files/jj-0.20.0-bump-git2.patch deleted file mode 100644 index fcf227a46..000000000 --- a/dev-vcs/jj/files/jj-0.20.0-bump-git2.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 9a5d201d8756d822ec5990a4a5b58acf8aac9519 Mon Sep 17 00:00:00 2001 -From: Benjamin Tan <benjamin@dev.ofcr.se> -Date: Sat, 13 Jul 2024 20:29:13 +0800 -Subject: [PATCH] cargo: bump `git2` to 0.19.0 - -This includes a bump of `libgit2` to v1.8.1. ---- - Cargo.lock | 8 ++++---- - Cargo.toml | 2 +- - cli/tests/test_git_push.rs | 2 ++ - lib/src/git.rs | 7 ++++++- - 4 files changed, 13 insertions(+), 6 deletions(-) - -diff --git a/Cargo.lock b/Cargo.lock -index 4d2be3561f..fd3b9bdc6b 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -979,9 +979,9 @@ checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" - - [[package]] - name = "git2" --version = "0.18.3" -+version = "0.19.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" -+checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" - dependencies = [ - "bitflags 2.6.0", - "libc", -@@ -2027,9 +2027,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - - [[package]] - name = "libgit2-sys" --version = "0.16.2+1.7.2" -+version = "0.17.0+1.8.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" -+checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" - dependencies = [ - "cc", - "libc", -diff --git a/Cargo.toml b/Cargo.toml -index a5c270733e..96d6b02310 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -49,7 +49,7 @@ dunce = "1.0.5" - either = "1.13.0" - esl01-renderdag = "0.3.0" - futures = "0.3.30" --git2 = { version = "0.18.3", features = [ -+git2 = { version = "0.19.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 -diff --git a/cli/tests/test_git_push.rs b/cli/tests/test_git_push.rs -index 8126e24442..7e3cfe75f1 100644 ---- a/cli/tests/test_git_push.rs -+++ b/cli/tests/test_git_push.rs -@@ -1235,6 +1235,8 @@ fn test_git_push_moved_sideways_untracked() { - } - - #[test] -+// TODO: This test fails with libgit2 v1.8.1 on Windows. -+#[cfg(not(target_os = "windows"))] - fn test_git_push_to_remote_named_git() { - let (test_env, workspace_root) = set_up(); - let git_repo = { -diff --git a/lib/src/git.rs b/lib/src/git.rs -index d7066a22f7..f4030a7ca2 100644 ---- a/lib/src/git.rs -+++ b/lib/src/git.rs -@@ -1265,7 +1265,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; |