ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

merge: ask user for commit description

Browse source 
The command would leave the description blank until now.
This commit is contained in:
Martin von Zweigbergk 2021-01-23 22:08:13 -08:00
parent bad23cda74
commit c459c61cdb
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/commands.rs
View file

@ -1562,10 +1562,12 @@ fn cmd_merge(
parent_ids.push(commit.id().clone());
commits.push(commit);
}
let description = edit_description(&repo, "");
let merged_tree = merge_commit_trees(repo.store(), &commits);
let mut tx = repo.start_transaction("merge commits");
CommitBuilder::for_new_commit(ui.settings(), repo.store(), merged_tree.id().clone())
.set_parents(parent_ids)
.set_description(description)
.set_open(false)
.write_to_transaction(&mut tx);
update_checkout_after_rewrite(ui, &mut tx);