diff --git a/Cargo.lock b/Cargo.lock index c0ba7c05..6539cfda 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -913,7 +913,7 @@ dependencies = [ [[package]] name = "git-ref-format" version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-git?rev=016ece66474edf45d2d304141515152e6f7b37a3#016ece66474edf45d2d304141515152e6f7b37a3" +source = "git+https://github.com/radicle-dev/radicle-git?rev=48022590d0439e7fb196605a573a725bbbf0e4d2#48022590d0439e7fb196605a573a725bbbf0e4d2" dependencies = [ "git-ref-format-core", "git-ref-format-macro", @@ -922,7 +922,7 @@ dependencies = [ [[package]] name = "git-ref-format-core" version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-git?rev=016ece66474edf45d2d304141515152e6f7b37a3#016ece66474edf45d2d304141515152e6f7b37a3" +source = "git+https://github.com/radicle-dev/radicle-git?rev=48022590d0439e7fb196605a573a725bbbf0e4d2#48022590d0439e7fb196605a573a725bbbf0e4d2" dependencies = [ "serde", "thiserror", @@ -931,7 +931,7 @@ dependencies = [ [[package]] name = "git-ref-format-macro" version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-git?rev=016ece66474edf45d2d304141515152e6f7b37a3#016ece66474edf45d2d304141515152e6f7b37a3" +source = "git+https://github.com/radicle-dev/radicle-git?rev=48022590d0439e7fb196605a573a725bbbf0e4d2#48022590d0439e7fb196605a573a725bbbf0e4d2" dependencies = [ "git-ref-format-core", "proc-macro-error", @@ -1921,7 +1921,7 @@ dependencies = [ [[package]] name = "radicle-git-ext" version = "0.2.0" -source = "git+https://github.com/radicle-dev/radicle-git?rev=016ece66474edf45d2d304141515152e6f7b37a3#016ece66474edf45d2d304141515152e6f7b37a3" +source = "git+https://github.com/radicle-dev/radicle-git?rev=48022590d0439e7fb196605a573a725bbbf0e4d2#48022590d0439e7fb196605a573a725bbbf0e4d2" dependencies = [ "git-ref-format", "git2", @@ -2015,12 +2015,12 @@ dependencies = [ [[package]] name = "radicle-std-ext" version = "0.1.0" -source = "git+https://github.com/radicle-dev/radicle-git?rev=016ece66474edf45d2d304141515152e6f7b37a3#016ece66474edf45d2d304141515152e6f7b37a3" +source = "git+https://github.com/radicle-dev/radicle-git?rev=48022590d0439e7fb196605a573a725bbbf0e4d2#48022590d0439e7fb196605a573a725bbbf0e4d2" [[package]] name = "radicle-surf" version = "0.8.0" -source = "git+https://github.com/radicle-dev/radicle-git?rev=016ece66474edf45d2d304141515152e6f7b37a3#016ece66474edf45d2d304141515152e6f7b37a3" +source = "git+https://github.com/radicle-dev/radicle-git?rev=48022590d0439e7fb196605a573a725bbbf0e4d2#48022590d0439e7fb196605a573a725bbbf0e4d2" dependencies = [ "anyhow", "base64", diff --git a/Cargo.toml b/Cargo.toml index b8a8e77d..93c11c03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,8 +30,8 @@ incremental = false [patch.crates-io.radicle-git-ext] git = "https://github.com/radicle-dev/radicle-git" -rev = "016ece66474edf45d2d304141515152e6f7b37a3" +rev = "48022590d0439e7fb196605a573a725bbbf0e4d2" [patch.crates-io.git-ref-format] git = "https://github.com/radicle-dev/radicle-git" -rev = "016ece66474edf45d2d304141515152e6f7b37a3" +rev = "48022590d0439e7fb196605a573a725bbbf0e4d2" diff --git a/radicle-httpd/Cargo.toml b/radicle-httpd/Cargo.toml index 1ecedff9..8bc87c1d 100644 --- a/radicle-httpd/Cargo.toml +++ b/radicle-httpd/Cargo.toml @@ -40,7 +40,7 @@ version = "0.2.0" [dependencies.radicle-surf] git = "https://github.com/radicle-dev/radicle-git" features = ["serde"] -rev = "016ece66474edf45d2d304141515152e6f7b37a3" +rev = "48022590d0439e7fb196605a573a725bbbf0e4d2" [dev-dependencies] hyper = { version = "0.14.17", default-features = false, features = ["client"] } diff --git a/radicle-httpd/src/api/json.rs b/radicle-httpd/src/api/json.rs index ee2bfb01..9516b4e9 100644 --- a/radicle-httpd/src/api/json.rs +++ b/radicle-httpd/src/api/json.rs @@ -4,7 +4,8 @@ use std::path::Path; use serde_json::{json, Value}; -use radicle_surf::object::{Blob, Tree}; +use radicle_surf::blob::Blob; +use radicle_surf::tree::Tree; use radicle_surf::{Commit, Stats}; /// Returns JSON of a commit.