cargo: bump git2 to 0.18.1

jj-vcs · Dec 15, 2023 · d420002 · d420002
1 parent b8f60c4
commit d420002
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -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",

diff --git a/cli/tests/test_git_clone.rs b/cli/tests/test_git_clone.rs
@@ -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());