Skip to content

Commit dbf079f

Browse files
committed
reproduce issue with 'too many packs' for slotmap
1 parent 724601d commit dbf079f

File tree

4 files changed

+80
-0
lines changed

4 files changed

+80
-0
lines changed

gix/src/commit.rs

+8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
//!
22
#![allow(clippy::empty_docs)]
33

4+
use std::convert::Infallible;
5+
46
/// An empty array of a type usable with the `gix::easy` API to help declaring no parents should be used
57
pub const NO_PARENT_IDS: [gix_hash::ObjectId; 0] = [];
68

@@ -22,6 +24,12 @@ pub enum Error {
2224
ReferenceEdit(#[from] crate::reference::edit::Error),
2325
}
2426

27+
impl From<std::convert::Infallible> for Error {
28+
fn from(_value: Infallible) -> Self {
29+
unreachable!("cannot be invoked")
30+
}
31+
}
32+
2533
///
2634
#[cfg(feature = "revision")]
2735
pub mod describe {

gix/src/remote/connection/fetch/update_refs/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ pub(crate) fn update(
102102
let update = if is_implicit_tag {
103103
Mode::ImplicitTagNotSentByRemote.into()
104104
} else {
105+
// Assure the ODB is not to blame for the missing object.
106+
repo.try_find_object(remote_id)?;
105107
Mode::RejectedSourceObjectNotFound { id: remote_id.into() }.into()
106108
};
107109
updates.push(update);

gix/src/remote/connection/fetch/update_refs/update.rs

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ mod error {
2323
PeelToId(#[from] crate::reference::peel::Error),
2424
#[error("Failed to follow a symbolic reference to assure worktree isn't affected")]
2525
FollowSymref(#[from] gix_ref::file::find::existing::Error),
26+
#[error(transparent)]
27+
FindObject(#[from] crate::object::find::Error),
2628
}
2729
}
2830

gix/tests/gix/remote/fetch.rs

+68
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,74 @@ mod blocking_and_async_io {
8585
try_repo_rw(name).unwrap()
8686
}
8787

88+
#[test]
89+
#[cfg(feature = "blocking-network-client")]
90+
fn fetch_more_packs_than_can_be_handled() -> gix_testtools::Result {
91+
use gix::config::tree::User;
92+
use gix::interrupt::IS_INTERRUPTED;
93+
use gix_odb::store::init::Slots;
94+
use gix_testtools::tempfile;
95+
fn create_empty_commit(repo: &gix::Repository) -> anyhow::Result<()> {
96+
let name = repo.head_name()?.expect("no detached head");
97+
repo.commit(
98+
name.as_bstr(),
99+
"empty",
100+
gix::hash::ObjectId::empty_tree(repo.object_hash()),
101+
repo.try_find_reference(name.as_ref())?.map(|r| r.id()),
102+
)?;
103+
Ok(())
104+
}
105+
for max_packs in 1..=3 {
106+
let remote_dir = tempfile::tempdir()?;
107+
let mut remote_repo = gix::init_bare(remote_dir.path())?;
108+
{
109+
let mut config = remote_repo.config_snapshot_mut();
110+
config.set_value(&User::NAME, "author")?;
111+
config.set_value(&User::EMAIL, "[email protected]")?;
112+
}
113+
create_empty_commit(&remote_repo)?;
114+
115+
let local_dir = tempfile::tempdir()?;
116+
let (local_repo, _) = gix::clone::PrepareFetch::new(
117+
remote_repo.path(),
118+
local_dir.path(),
119+
gix::create::Kind::Bare,
120+
Default::default(),
121+
gix::open::Options::isolated().object_store_slots(Slots::Given(max_packs)),
122+
)?
123+
.fetch_only(gix::progress::Discard, &IS_INTERRUPTED)?;
124+
125+
let remote = local_repo
126+
.branch_remote(
127+
local_repo.head_ref()?.expect("branch available").name().shorten(),
128+
Fetch,
129+
)
130+
.expect("remote is configured after clone")?;
131+
for _round_to_create_pack in 1..12 {
132+
create_empty_commit(&remote_repo)?;
133+
match remote
134+
.connect(Fetch)?
135+
.prepare_fetch(gix::progress::Discard, Default::default())?
136+
.receive(gix::progress::Discard, &IS_INTERRUPTED)
137+
{
138+
Ok(out) => {
139+
for local_tracking_branch_name in out.ref_map.mappings.into_iter().filter_map(|m| m.local) {
140+
let r = local_repo.find_reference(&local_tracking_branch_name)?;
141+
r.id()
142+
.object()
143+
.expect("object should be present after fetching, triggering pack refreshes works");
144+
local_repo.head_ref()?.unwrap().set_target_id(r.id(), "post fetch")?;
145+
}
146+
}
147+
Err(err) => assert!(err
148+
.to_string()
149+
.starts_with("The slotmap turned out to be too small with ")),
150+
}
151+
}
152+
}
153+
Ok(())
154+
}
155+
88156
#[test]
89157
#[cfg(feature = "blocking-network-client")]
90158
#[allow(clippy::result_large_err)]

0 commit comments

Comments
 (0)