Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

git-protocol: fix bad gitoxide release #752

Merged
merged 1 commit into from
Aug 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions git-protocol/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ version = "0.6.0"
features = ["async-io"]

[dependencies.git-protocol]
version = "0.8.0"
version = "0.8.1"
features = ["async-client"]

[dependencies.git-transport]
version = "0.9.0"
version = "0.10.0"
features = ["async-client"]

[dependencies.git2]
Expand Down
5 changes: 1 addition & 4 deletions git-protocol/src/fetch.rs
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,6 @@ impl<P: PackWriter> DelegateBlocking for Fetch<P, P::Output> {
// send done, as we don't bother with further negotiation
Ok(Action::Cancel)
}

fn indicate_client_done_when_fetch_completes(&self) -> bool {
false
}
}

#[async_trait(?Send)]
Expand Down Expand Up @@ -259,6 +255,7 @@ where
&mut delegate,
|_| unreachable!("credentials helper requested"),
progress::Discard,
git_protocol::FetchConnection::AllowReuse,
))
.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;

Expand Down
5 changes: 1 addition & 4 deletions git-protocol/src/ls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,10 +110,6 @@ impl DelegateBlocking for LsRefs {
) -> io::Result<Action> {
unreachable!("`negotiate` called even though no `fetch` command was sent")
}

fn indicate_client_done_when_fetch_completes(&self) -> bool {
false
}
}

#[async_trait(?Send)]
Expand Down Expand Up @@ -141,6 +137,7 @@ where
&mut delegate,
|_| unreachable!("credentials helper requested"),
progress::Discard,
git_protocol::FetchConnection::AllowReuse,
)
.await
.map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
Expand Down
2 changes: 1 addition & 1 deletion git-protocol/src/transport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ where
&[Protocol::V2]
}

fn is_stateful(&self) -> bool {
fn connection_persists_across_multiple_requests(&self) -> bool {
false
}
}
Expand Down