From 77c23f653cde588e008b222d9f9d4b174e6bf270 Mon Sep 17 00:00:00 2001
From: Benjamin Tan <benjamin@dev.ofcr.se>
Date: Sat, 2 Mar 2024 00:43:48 +0800
Subject: [PATCH] git: enable `libgit2`'s OpenSSH feature

---
 Cargo.lock          | 15 ---------------
 Cargo.toml          |  4 +++-
 cli/src/git_util.rs |  4 ++--
 flake.nix           |  6 ++----
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 834be9f7dc..fa7f00dd0f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1982,7 +1982,6 @@ source = "git+https://github.com/bnjmnt4n/git2-rs.git?rev=60e29ff0d#60e29ff0d84c
 dependencies = [
  "cc",
  "libc",
- "libssh2-sys",
  "libz-sys",
  "openssl-sys",
  "pkg-config",
@@ -1999,20 +1998,6 @@ dependencies = [
  "redox_syscall",
 ]
 
-[[package]]
-name = "libssh2-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee"
-dependencies = [
- "cc",
- "libc",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
- "vcpkg",
-]
-
 [[package]]
 name = "libz-sys"
 version = "1.1.20"
diff --git a/Cargo.toml b/Cargo.toml
index 63b9dd65d9..020e2c3b4e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,7 +48,9 @@ dunce = "1.0.5"
 either = "1.13.0"
 esl01-renderdag = "0.3.0"
 futures = "0.3.31"
-git2 = { git = "https://github.com/bnjmnt4n/git2-rs.git", rev = "60e29ff0d", features = [
+git2 = { git = "https://github.com/bnjmnt4n/git2-rs.git", rev = "60e29ff0d", default-features = false, features = [
+    "https",
+    "ssh-openssh",
     # 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/src/git_util.rs b/cli/src/git_util.rs
index 1471ede432..d12e4682fe 100644
--- a/cli/src/git_util.rs
+++ b/cli/src/git_util.rs
@@ -56,8 +56,8 @@ pub fn map_git_error(err: git2::Error) -> CommandError {
                  successfully load certificates. Try setting it to the path of a directory that \
                  contains a `.ssh` directory."
             } else {
-                "Jujutsu uses libssh2, which doesn't respect ~/.ssh/config. Does `ssh -F \
-                 /dev/null` to the host work?"
+                "There was an error creating an SSH connection. Does `ssh -F /dev/null` to the \
+                 host work?"
             };
 
         user_error_with_hint(err, hint)
diff --git a/flake.nix b/flake.nix
index 05a0fa20a1..f4ac0c9b2b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -99,11 +99,10 @@
             openssh
           ] ++ linuxNativeDeps;
           buildInputs = with pkgs; [
-            openssl zstd libgit2 libssh2
+            openssl zstd libgit2 openssh
           ] ++ darwinDeps;
 
           ZSTD_SYS_USE_PKG_CONFIG = "1";
-          LIBSSH2_SYS_USE_PKG_CONFIG = "1";
           RUSTFLAGS = pkgs.lib.optionalString pkgs.stdenv.isLinux "-C link-arg=-fuse-ld=mold";
           NIX_JJ_GIT_HASH = self.rev or "";
           CARGO_INCREMENTAL = "0";
@@ -162,7 +161,7 @@
           })
 
           # Foreign dependencies
-          openssl zstd libgit2 libssh2
+          openssl zstd libgit2
           pkg-config
 
           # Additional tools recommended by contributing.md
@@ -188,7 +187,6 @@
         shellHook = ''
           export RUST_BACKTRACE=1
           export ZSTD_SYS_USE_PKG_CONFIG=1
-          export LIBSSH2_SYS_USE_PKG_CONFIG=1
 
           export RUSTFLAGS="-Zthreads=0 ${rustLinkFlagsString}"
         '';