Radish alpha
r
radicle-git
rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt
Git libraries for Radicle
Radicle
Git
Commits › 224ad08
Update to git2-0.19
Fintan Halpenny committed 1 year ago
commit 224ad083669dcf4ab2f19813c79340b6ea58ca4c
parent 0dd1383
8 files changed +48 -50
modified Cargo.lock
@@ -316,9 +316,9 @@ dependencies = [


[[package]]

name = "git2"
- 
version = "0.18.2"
+ 
version = "0.19.0"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd"
+ 
checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"

dependencies = [

 "bitflags 2.4.2",

 "libc",
@@ -385,9 +385,9 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"


[[package]]

name = "libgit2-sys"
- 
version = "0.16.2+1.7.2"
+ 
version = "0.17.0+1.8.1"

source = "registry+https://github.com/rust-lang/crates.io-index"
- 
checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8"
+ 
checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"

dependencies = [

 "cc",

 "libc",
modified git-storage/Cargo.toml
@@ -13,7 +13,7 @@ thiserror = "1"
either = "1.8.0"



[dependencies.git2]
- 
version = "0.18.1"
+ 
version = "0.19"

default-features = false

features = ["vendored-libgit2"]
modified git-storage/t/Cargo.toml
@@ -21,7 +21,7 @@ proptest = "1"
path = ".."



[dependencies.git2]
- 
version = "0.18.1"
+ 
version = "0.19"

default-features = false

features = ["vendored-libgit2"]
modified radicle-git-ext/Cargo.toml
@@ -26,7 +26,7 @@ percent-encoding = "2"
thiserror = "1"



[dependencies.git2]
- 
version = "0.18.1"
+ 
version = "0.19"

default-features = false

features = ["vendored-libgit2"]
modified radicle-git-ext/t/Cargo.toml
@@ -24,7 +24,7 @@ serde = "1"
serde_json = "1"



[dependencies.git2]
- 
version = "0.18.1"
+ 
version = "0.19"

default-features = false

features = ["vendored-libgit2"]
modified radicle-surf/Cargo.toml
@@ -36,7 +36,7 @@ thiserror = "1.0"
url = "2.5"



[dependencies.git2]
- 
version = "0.18.1"
+ 
version = "0.19"

default-features = false

features = ["vendored-libgit2"]
modified radicle-surf/t/Cargo.toml
@@ -20,7 +20,7 @@ serde_json = "1"
url = "2.5"



[dev-dependencies.git2]
- 
version = "0.18.1"
+ 
version = "0.19"

default-features = false

features = ["vendored-libgit2"]
modified radicle-surf/t/src/diff.rs
@@ -630,44 +630,42 @@ index f89e4c0..7c56eb7 100644
    );

}
- 
// TODO(xphoniex): uncomment once libgit2 has fixed the bug
- 
//#[test]
- 
//fn test_old_missing_eof_newline() {
- 
//    let buf = r#"
- 
//diff --git a/.env b/.env
- 
//index f89e4c0..7c56eb7 100644
- 
//--- a/.env
- 
//+++ b/.env
- 
//@@ -1 +1 @@
- 
//-hello=123
- 
//\ No newline at end of file
- 
//+hello=1234
- 
//"#;
- 
//    let diff = git2::Diff::from_buffer(buf.as_bytes()).unwrap();
- 
//    let diff = Diff::try_from(diff).unwrap();
- 
//    assert_eq!(
- 
//        diff.modified().next().unwrap().diff.eof(),
- 
//        Some(EofNewLine::OldMissing)
- 
//    );
- 
//}
+ 
#[test]
+ 
fn test_old_missing_eof_newline() {
+ 
    let buf = r#"
+ 
diff --git a/.env b/.env
+ 
index f89e4c0..7c56eb7 100644
+ 
--- a/.env
+ 
+++ b/.env
+ 
@@ -1 +1 @@
+ 
-hello=123
+ 
\ No newline at end of file
+ 
+hello=1234
+ 
"#;
+ 
    let diff = git2::Diff::from_buffer(buf.as_bytes()).unwrap();
+ 
    let diff = Diff::try_from(diff).unwrap();
+ 
    assert_eq!(
+ 
        diff.modified().next().unwrap().diff.eof(),
+ 
        Some(EofNewLine::OldMissing)
+ 
    );
+ 
}
- 
// TODO(xphoniex): uncomment once libgit2 has fixed the bug
- 
//#[test]
- 
//fn test_new_missing_eof_newline() {
- 
//    let buf = r#"
- 
//diff --git a/.env b/.env
- 
//index f89e4c0..7c56eb7 100644
- 
//--- a/.env
- 
//+++ b/.env
- 
//@@ -1 +1 @@
- 
//-hello=123
- 
//+hello=1234
- 
//\ No newline at end of file
- 
//"#;
- 
//    let diff = git2::Diff::from_buffer(buf.as_bytes()).unwrap();
- 
//    let diff = Diff::try_from(diff).unwrap();
- 
//    assert_eq!(
- 
//        diff.modified().next().unwrap().diff.eof(),
- 
//        Some(EofNewLine::NewMissing)
- 
//    );
- 
//}
+ 
#[test]
+ 
fn test_new_missing_eof_newline() {
+ 
    let buf = r#"
+ 
diff --git a/.env b/.env
+ 
index f89e4c0..7c56eb7 100644
+ 
--- a/.env
+ 
+++ b/.env
+ 
@@ -1 +1 @@
+ 
-hello=123
+ 
+hello=1234
+ 
\ No newline at end of file
+ 
"#;
+ 
    let diff = git2::Diff::from_buffer(buf.as_bytes()).unwrap();
+ 
    let diff = Diff::try_from(diff).unwrap();
+ 
    assert_eq!(
+ 
        diff.modified().next().unwrap().diff.eof(),
+ 
        Some(EofNewLine::NewMissing)
+ 
    );
+ 
}