matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Write the tree before finding the parent commits

Browse source
This commit is contained in:
Matthias Beyer 2016-09-08 10:46:54 +02:00
parent 0366d0f8cb
commit bee4c2002d
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libimagstorestdhook/src/vcs/git/update.rs
View file

@ -139,6 +139,13 @@ impl StoreIdAccessor for UpdateHook {
.map_into_hook_error()
);
let tree_id = try!(
index.write_tree()
.map_err_into(GHEK::RepositoryIndexWritingError)
.map_dbg_err_str("Failed to write tree")
.map_into_hook_error()
);
let mut parents = Vec::new();
{
let commit = try!(
@ -153,14 +160,6 @@ impl StoreIdAccessor for UpdateHook {
// for converting from Vec<Commit> to Vec<&Commit>
let parents = parents.iter().collect::<Vec<_>>();
let tree_id = try!(
index.write_tree()
.map_err_into(GHEK::RepositoryIndexWritingError)
.map_dbg_err_str("Failed to write tree")
.map_into_hook_error()
);
let tree = try!(
repo.find_tree(tree_id)
.map_err_into(GHEK::RepositoryParentFetchingError)