gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-28 20:15:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fancy fast forward

Browse Source
This commit is contained in:
Caleb Owens 2024-09-04 13:33:57 +02:00 committed by Mattias Granlund
parent 924cc5df1e
commit e4834dbba9
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/gitbutler-repo/src/rebase.rs
View File

@ -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")?;