mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-09 05:58:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

git_backend: handle read_tree() lookup/encoding errors gracefully

Browse source
This commit is contained in:
Yuya Nishihara 2023-10-30 14:29:57 +09:00
parent 847adc832f
commit b3c9cab12d
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/src/git_backend.rs
View file

@ -590,14 +590,17 @@ impl Backend for GitBackend {
let git_tree_id = validate_git_object_id(id)?;
let locked_repo = self.repo.lock().unwrap();
let git_tree = locked_repo.find_tree(git_tree_id).unwrap();
let git_tree = locked_repo
.find_tree(git_tree_id)
.map_err(|err| map_not_found_err(err, id))?;
let mut tree = Tree::default();
for entry in git_tree.iter() {
let name = entry.name().unwrap();
let name =
str::from_utf8(entry.name_bytes()).map_err(|err| to_invalid_utf8_err(err, id))?;
let (name, value) = match entry.kind().unwrap() {
git2::ObjectType::Tree => {
let id = TreeId::from_bytes(entry.id().as_bytes());
(entry.name().unwrap(), TreeValue::Tree(id))
(name, TreeValue::Tree(id))
}
git2::ObjectType::Blob => match entry.filemode() {
0o100644 => {