Skip to content

Commit 224ad08

Browse files
committed
Update to git2-0.19
Update the `git2` dependencies to `0.19`, which also allows the uncommenting of two tests in the `diff` test suite -- as reported by [issue #149][#149]. [#149]: #149 Signed-off-by: Fintan Halpenny <fintan.halpenny@gmail.com> X-Clacks-Overhead: GNU Terry Pratchett
1 parent 0dd1383 commit 224ad08

File tree

8 files changed

+48
-50
lines changed

8 files changed

+48
-50
lines changed

Cargo.lock

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

git-storage/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ thiserror = "1"
1313
either = "1.8.0"
1414

1515
[dependencies.git2]
16-
version = "0.18.1"
16+
version = "0.19"
1717
default-features = false
1818
features = ["vendored-libgit2"]
1919

git-storage/t/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ proptest = "1"
2121
path = ".."
2222

2323
[dependencies.git2]
24-
version = "0.18.1"
24+
version = "0.19"
2525
default-features = false
2626
features = ["vendored-libgit2"]
2727

radicle-git-ext/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ percent-encoding = "2"
2626
thiserror = "1"
2727

2828
[dependencies.git2]
29-
version = "0.18.1"
29+
version = "0.19"
3030
default-features = false
3131
features = ["vendored-libgit2"]
3232

radicle-git-ext/t/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ serde = "1"
2424
serde_json = "1"
2525

2626
[dependencies.git2]
27-
version = "0.18.1"
27+
version = "0.19"
2828
default-features = false
2929
features = ["vendored-libgit2"]
3030

radicle-surf/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ thiserror = "1.0"
3636
url = "2.5"
3737

3838
[dependencies.git2]
39-
version = "0.18.1"
39+
version = "0.19"
4040
default-features = false
4141
features = ["vendored-libgit2"]
4242

radicle-surf/t/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ serde_json = "1"
2020
url = "2.5"
2121

2222
[dev-dependencies.git2]
23-
version = "0.18.1"
23+
version = "0.19"
2424
default-features = false
2525
features = ["vendored-libgit2"]
2626

radicle-surf/t/src/diff.rs

Lines changed: 38 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -630,44 +630,42 @@ index f89e4c0..7c56eb7 100644
630630
);
631631
}
632632

633-
// TODO(xphoniex): uncomment once libgit2 has fixed the bug
634-
//#[test]
635-
//fn test_old_missing_eof_newline() {
636-
// let buf = r#"
637-
//diff --git a/.env b/.env
638-
//index f89e4c0..7c56eb7 100644
639-
//--- a/.env
640-
//+++ b/.env
641-
//@@ -1 +1 @@
642-
//-hello=123
643-
//\ No newline at end of file
644-
//+hello=1234
645-
//"#;
646-
// let diff = git2::Diff::from_buffer(buf.as_bytes()).unwrap();
647-
// let diff = Diff::try_from(diff).unwrap();
648-
// assert_eq!(
649-
// diff.modified().next().unwrap().diff.eof(),
650-
// Some(EofNewLine::OldMissing)
651-
// );
652-
//}
633+
#[test]
634+
fn test_old_missing_eof_newline() {
635+
let buf = r#"
636+
diff --git a/.env b/.env
637+
index f89e4c0..7c56eb7 100644
638+
--- a/.env
639+
+++ b/.env
640+
@@ -1 +1 @@
641+
-hello=123
642+
\ No newline at end of file
643+
+hello=1234
644+
"#;
645+
let diff = git2::Diff::from_buffer(buf.as_bytes()).unwrap();
646+
let diff = Diff::try_from(diff).unwrap();
647+
assert_eq!(
648+
diff.modified().next().unwrap().diff.eof(),
649+
Some(EofNewLine::OldMissing)
650+
);
651+
}
653652

654-
// TODO(xphoniex): uncomment once libgit2 has fixed the bug
655-
//#[test]
656-
//fn test_new_missing_eof_newline() {
657-
// let buf = r#"
658-
//diff --git a/.env b/.env
659-
//index f89e4c0..7c56eb7 100644
660-
//--- a/.env
661-
//+++ b/.env
662-
//@@ -1 +1 @@
663-
//-hello=123
664-
//+hello=1234
665-
//\ No newline at end of file
666-
//"#;
667-
// let diff = git2::Diff::from_buffer(buf.as_bytes()).unwrap();
668-
// let diff = Diff::try_from(diff).unwrap();
669-
// assert_eq!(
670-
// diff.modified().next().unwrap().diff.eof(),
671-
// Some(EofNewLine::NewMissing)
672-
// );
673-
//}
653+
#[test]
654+
fn test_new_missing_eof_newline() {
655+
let buf = r#"
656+
diff --git a/.env b/.env
657+
index f89e4c0..7c56eb7 100644
658+
--- a/.env
659+
+++ b/.env
660+
@@ -1 +1 @@
661+
-hello=123
662+
+hello=1234
663+
\ No newline at end of file
664+
"#;
665+
let diff = git2::Diff::from_buffer(buf.as_bytes()).unwrap();
666+
let diff = Diff::try_from(diff).unwrap();
667+
assert_eq!(
668+
diff.modified().next().unwrap().diff.eof(),
669+
Some(EofNewLine::NewMissing)
670+
);
671+
}

0 commit comments

Comments
 (0)