mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-02-06 11:34:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge_tools: avoid re-reading edited file, read from buffer instead

Browse source 
I suspect this was just because it wasn't obvious to the author how to
get a `Read` from an in-memory buffer (I know it wasn't to me).
This commit is contained in:
Martin von Zweigbergk 2023-05-30 17:08:01 -07:00 committed by Martin von Zweigbergk
parent 04a107babf
commit a5ef4f0f40
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/merge_tools.rs
View file

@ -271,7 +271,7 @@ pub fn run_mergetool(
let new_tree_value = new_tree_value.unwrap_or({ let new_tree_value = new_tree_value.unwrap_or({
let new_file_id = tree let new_file_id = tree
.store() .store()
.write_file(repo_path, &mut File::open(paths.get("output").unwrap())?)?; .write_file(repo_path, &mut output_file_contents.as_slice())?;
TreeValue::File { TreeValue::File {
id: new_file_id, id: new_file_id,
executable: false, executable: false,