mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-16 00:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

cli: commit: set up rewritten commit early

Browse source 
For the same reason as the previous commit.
This commit is contained in:
Yuya Nishihara 2024-07-20 17:06:13 +09:00
parent 453e4f3fcc
commit 7d50ebc23e
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cli/src/commands/commit.rs
View file

@ -98,6 +98,15 @@ new working-copy commit.
)?;
}
let mut commit_builder = tx
.mut_repo()
.rewrite_commit(command.settings(), &commit)
.detach();
commit_builder.set_tree_id(tree_id);
if args.reset_author {
commit_builder.set_author(commit_builder.committer().clone());
}
let template = description_template_for_commit(
ui,
command.settings(),
@ -113,17 +122,9 @@ new working-copy commit.
} else {
edit_description(tx.base_repo(), &template, command.settings())?
};
commit_builder.set_description(description);
let new_commit = commit_builder.write(tx.mut_repo())?;
let mut commit_builder = tx
.mut_repo()
.rewrite_commit(command.settings(), &commit)
.set_tree_id(tree_id)
.set_description(description);
if args.reset_author {
let new_author = commit_builder.committer().clone();
commit_builder = commit_builder.set_author(new_author);
}
let new_commit = commit_builder.write()?;
let workspace_ids = tx
.mut_repo()
.view()