ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

cargo: bump git2 to 0.18.1

Browse source
This commit is contained in:
Yuya Nishihara 2023-12-15 12:57:10 +09:00
parent b8f60c4dd6
commit d420002ea2
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Cargo.lock generated
View file

@ -920,11 +920,11 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
[[package]]
name = "git2"
version = "0.17.2"
version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044"
checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
dependencies = [
"bitflags 1.3.2",
"bitflags 2.4.0",
"libc",
"libgit2-sys",
"log",
@ -1734,9 +1734,9 @@ checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
[[package]]
name = "libgit2-sys"
version = "0.15.2+1.6.4"
version = "0.16.1+1.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa"
checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
dependencies = [
"cc",
"libc",

2
Cargo.toml
View file

@ -41,7 +41,7 @@ dirs = "5.0.1"
either = "1.9.0"
esl01-renderdag = "0.3.0"
futures = "0.3.29"
git2 = "0.17.2"
git2 = "0.18.1"
gix = { version = "0.56.0", default-features = false, features = [
"index",
"max-performance-safe",

14
cli/tests/test_git_clone.rs
View file

@ -86,7 +86,7 @@ fn test_git_clone() {
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Fetching into new repo in "$TEST_ENV/failed"
Error: could not find repository from '$TEST_ENV/bad'; class=Repository (6)
Error: could not find repository at '$TEST_ENV/bad'; class=Repository (6)
"###);
assert!(!test_env.env_root().join("failed").exists());
@ -101,7 +101,7 @@ fn test_git_clone() {
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Fetching into new repo in "$TEST_ENV/failed"
Error: could not find repository from '$TEST_ENV/bad'; class=Repository (6)
Error: could not find repository at '$TEST_ENV/bad'; class=Repository (6)
"###);
assert!(test_env.env_root().join("failed").exists());
assert!(!test_env.env_root().join("failed").join(".jj").exists());
@ -224,9 +224,9 @@ fn test_git_clone_colocate() {
.map(|entry| format!("{:?} {}\n", entry.status(), entry.path().unwrap()))
.collect();
insta::assert_snapshot!(git_statuses, @r###"
IGNORED .jj/.gitignore
IGNORED .jj/repo/
IGNORED .jj/working_copy/
Status(IGNORED) .jj/.gitignore
Status(IGNORED) .jj/repo/
Status(IGNORED) .jj/working_copy/
"###);
// The old default branch "master" shouldn't exist.
@ -262,7 +262,7 @@ fn test_git_clone_colocate() {
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Fetching into new repo in "$TEST_ENV/failed"
Error: could not find repository from '$TEST_ENV/bad'; class=Repository (6)
Error: could not find repository at '$TEST_ENV/bad'; class=Repository (6)
"###);
assert!(!test_env.env_root().join("failed").exists());
@ -280,7 +280,7 @@ fn test_git_clone_colocate() {
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"
Fetching into new repo in "$TEST_ENV/failed"
Error: could not find repository from '$TEST_ENV/bad'; class=Repository (6)
Error: could not find repository at '$TEST_ENV/bad'; class=Repository (6)
"###);
assert!(test_env.env_root().join("failed").exists());
assert!(!test_env.env_root().join("failed").join(".git").exists());