Skip to content

Commit e791bc5

Browse files
committed
Merge branch 'status'
2 parents 452e2b7 + 52f203a commit e791bc5

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ jobs:
150150
- name: "Install prerequisites"
151151
run: vcpkg install zlib:x64-windows-static-md
152152
- name: "Installation from crates.io: gitoxide"
153-
run: cargo +${{ matrix.rust }} install --target ${{ matrix.target }} --target-dir install-artifacts --debug --force gitoxide
153+
run: cargo +${{ matrix.rust }} install --target ${{ matrix.target }} --no-default-features --features max-pure --target-dir install-artifacts --debug --force gitoxide
154154
shell: msys2 {0}
155155

156156
lint:

gix/src/remote/connection/fetch/error.rs

+2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ pub enum Error {
4545
RejectShallowRemote,
4646
#[error(transparent)]
4747
NegotiationAlgorithmConfig(#[from] config::key::GenericErrorWithValue),
48+
#[error("Failed to read remaining bytes in stream")]
49+
ReadRemainingBytes(#[source] std::io::Error),
4850
}
4951

5052
impl gix_protocol::transport::IsSpuriousError for Error {

gix/src/remote/connection/fetch/receive_pack.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ where
287287
#[cfg(not(feature = "async-network-client"))]
288288
let has_read_to_end = { rd.stopped_at().is_some() };
289289
if !has_read_to_end {
290-
std::io::copy(&mut rd, &mut std::io::sink()).unwrap();
290+
std::io::copy(&mut rd, &mut std::io::sink()).map_err(Error::ReadRemainingBytes)?;
291291
}
292292
#[cfg(feature = "async-network-client")]
293293
{

0 commit comments

Comments
 (0)