| @@ -163,8 +163,8 @@ pub fn pack_or_pack_index( · 162 unmodified lines |
| 163 | use anyhow::Context; | 163 | use anyhow::Context; |
| 164 | | 164 | |
| 165 | let path = pack_path.as_ref(); | 165 | let path = pack_path.as_ref(); |
| 166 | let hash_kind = git_repository::hash::Kind::Sha1; // TODO: make this configurable via CLI, maybe even different values for I/O | 166 | let object_hash = git_repository::hash::Kind::Sha1; // TODO: make this configurable via CLI, maybe even different values for I/O |
| 167 | let bundle = pack::Bundle::at(path, hash_kind).with_context(|| { | 167 | let bundle = pack::Bundle::at(path, object_hash).with_context(|| { |
| 168 | format!( | 168 | format!( |
| 169 | "Could not find .idx or .pack file from given file at '{}'", | 169 | "Could not find .idx or .pack file from given file at '{}'", |
| 170 | path.display() | 170 | path.display() |
| @@ -199,8 +199,8 @@ pub fn pack_or_pack_index( · 28 unmodified lines |
| 199 | { | 199 | { |
| 200 | let object_path = object_path.map(|p| p.as_ref().to_owned()); | 200 | let object_path = object_path.map(|p| p.as_ref().to_owned()); |
| 201 | move || { | 201 | move || { |
| 202 | let out = OutputWriter::new(object_path.clone(), sink_compress, hash_kind); | 202 | let out = OutputWriter::new(object_path.clone(), sink_compress, object_hash); |
| 203 | let object_verifier = if verify { object_path.as_ref().map(|path| loose::Store::at(path, hash_kind)) } else { None }; | 203 | let object_verifier = if verify { object_path.as_ref().map(|path| loose::Store::at(path, object_hash)) } else { None }; |
| 204 | let mut read_buf = Vec::new(); | 204 | let mut read_buf = Vec::new(); |
| 205 | move |object_kind, buf, index_entry, progress| { | 205 | move |object_kind, buf, index_entry, progress| { |
| 206 | let written_id = out.write_buf(object_kind, buf).map_err(|err| { | 206 | let written_id = out.write_buf(object_kind, buf).map_err(|err| { |