mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-23 06:57:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

rewrite: make EmptyBehavior implement Copy

Browse source
This commit is contained in:
Martin von Zweigbergk 2024-04-12 08:56:10 -07:00 committed by Martin von Zweigbergk
parent 402d94dbd7
commit b13cb8db26
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/src/rewrite.rs
View file

@ -290,7 +290,7 @@ pub fn back_out_commit(
.write()
}
#[derive(Clone, Default, PartialEq, Eq, Debug)]
#[derive(Clone, Copy, Default, PartialEq, Eq, Debug)]
pub enum EmptyBehaviour {
/// Always keep empty commits
#[default]

2
lib/tests/test_rewrite.rs
View file

@ -1589,7 +1589,7 @@ fn test_empty_commit_option(empty_behavior: EmptyBehaviour) {
.rebase_descendants_with_options_return_map(
&settings,
RebaseOptions {
empty: empty_behavior.clone(),
empty: empty_behavior,
simplify_ancestor_merge: true,
},
)