Skip to content

Commit 8a7f244

Browse files
committed
git: enable libgit2's OpenSSH feature
1 parent d816a23 commit 8a7f244

File tree

4 files changed

+6
-20
lines changed

4 files changed

+6
-20
lines changed

Cargo.lock

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ dirs = "5.0.1"
4646
dunce = "1.0.5"
4747
either = "1.13.0"
4848
futures = "0.3.31"
49-
git2 = { git = "https://github.com/bnjmnt4n/git2-rs.git", rev = "8614b5d", features = [
49+
git2 = { git = "https://github.com/bnjmnt4n/git2-rs.git", rev = "8614b5d", default-features = false, features = [
50+
"https",
51+
"ssh-openssh",
5052
# Do *not* disable this feature even if you'd like dynamic linking. Instead,
5153
# set the environment variable `LIBGIT2_NO_VENDOR=1` if dynamic linking must
5254
# be used (this will override the Cargo feature), and allow static linking

cli/src/command_error.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -605,8 +605,8 @@ jj currently does not support partial clones. To use jj with this repository, tr
605605
successfully load certificates. Try setting it to the path of a directory that \
606606
contains a `.ssh` directory."
607607
} else {
608-
"Jujutsu uses libssh2, which doesn't respect ~/.ssh/config. Does `ssh -F \
609-
/dev/null` to the host work?"
608+
"There was an error creating an SSH connection. Does `ssh -F /dev/null` to the \
609+
host work?"
610610
};
611611

612612
user_error_with_hint(err, hint)

flake.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
[
7878
openssl
7979
libgit2
80-
libssh2
80+
openssh
8181
]
8282
++ lib.optionals stdenv.isDarwin [
8383
darwin.apple_sdk.frameworks.Security
@@ -95,7 +95,6 @@
9595
];
9696

9797
env = {
98-
LIBSSH2_SYS_USE_PKG_CONFIG = "1";
9998
RUST_BACKTRACE = 1;
10099
};
101100
in {

0 commit comments

Comments
 (0)