git: enable libgit2's OpenSSH feature

jj-vcs · Jan 23, 2025 · e54d2dc · e54d2dc
1 parent 7c2fe4c
commit e54d2dc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 20 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -46,7 +46,9 @@ dirs = "5.0.1"
 dunce = "1.0.5"
 either = "1.13.0"
 futures = "0.3.31"
-git2 = { git = "https://github.com/bnjmnt4n/git2-rs.git", rev = "8614b5d", features = [
+git2 = { git = "https://github.com/bnjmnt4n/git2-rs.git", rev = "8614b5d", 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
@@ -64,8 +64,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
@@ -64,7 +64,7 @@
         [
           openssl
           libgit2
-          libssh2
+          openssh
         ]
         ++ lib.optionals stdenv.isDarwin [
           darwin.apple_sdk.frameworks.Security
@@ -79,7 +79,6 @@
       ];
 
       env = {
-        LIBSSH2_SYS_USE_PKG_CONFIG = "1";
         RUST_BACKTRACE = 1;
       };
     in {
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ @@
             [
               openssl
               libgit2
-              libssh2
+              openssh
             ]
             ++ lib.optionals stdenv.isDarwin [
               darwin.apple_sdk.frameworks.Security
@@ Expand All / @@ -79,7 +79,6 @@ @@
           ];
           env = {
-            LIBSSH2_SYS_USE_PKG_CONFIG = "1";
             RUST_BACKTRACE = 1;
           };
         in {
@@ Expand Down @@