Fancy fast forward

gitbutlerapp · Sep 4, 2024 · e4834db · e4834db
1 parent 924cc5d
commit e4834db
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/crates/gitbutler-repo/src/rebase.rs b/crates/gitbutler-repo/src/rebase.rs
@@ -61,6 +61,10 @@ pub fn cherry_rebase_group(
             |head, to_rebase| {
                 let head = head?;
 
+                if to_rebase.parent_ids().len() == 1 && head.id() == to_rebase.parent_id(0)? {
+                    return Ok(to_rebase);
+                };
+
                 let cherrypick_index = repository
                     .cherry_pick_gitbutler(&head, &to_rebase, None)
                     .context("failed to cherry pick")?;