Skip to content

Commit

Permalink
…but there seem to be issues with the kernel pack…
Browse files Browse the repository at this point in the history
…as it's just a little too slow. Maybe just not enough memory or
something.
  • Loading branch information
Byron committed Aug 2, 2020
1 parent 43c7fd1 commit cc147bc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion git-odb/src/pack/index/write/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl pack::index::File {
root_progress.init(Some(3), Some("steps"));
root_progress.inc();
let mut progress = root_progress.add_child("indexing");
progress.init(entries.size_hint().1.map(|l| l as u32), Some("Objects"));
progress.init(entries.size_hint().1.map(|l| l as u32), Some("objects"));

for (eid, entry) in entries.enumerate() {
use pack::data::Header::*;
Expand Down Expand Up @@ -121,6 +121,7 @@ impl pack::index::File {
progress.inc();
}
progress.show_throughput(indexing_start, num_objects as u32, "objects");
drop(progress);
root_progress.inc();

// Prevent us from trying to find bases for resolution past the point where they are
Expand Down
2 changes: 1 addition & 1 deletion src/plumbing/lean.rs
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ use std::io::{stderr, stdout};
feature = "prodash-line-renderer-crossterm",
feature = "prodash-line-renderer-termion"
)))]
fn prepare(verbose: bool, name: &str) -> ((), Option<progress::Log>) {
fn prepare(verbose: bool, name: &str, _: u8, _: u8) -> ((), Option<progress::Log>) {
super::init_env_logger(verbose);
((), Some(progress::Log::new(name, Some(1))))
}
Expand Down

0 comments on commit cc147bc

Please sign in to comment.