gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-22 11:02:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Always rebase when applying from existing branch

Browse Source 
This ensures that change IDs are present
This commit is contained in:
Kiril Videlov 2024-11-20 20:01:29 +01:00
parent d8f321b8f6
commit df9a3902cd
No known key found for this signature in database
GPG Key ID: A4C733025427C471
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/gitbutler-branch-actions/src/branch_manager/branch_creation.rs
View File

@ -331,7 +331,11 @@ impl BranchManager<'_> {
} }
// Do we need to rebase the branch on top of the default target? // Do we need to rebase the branch on top of the default target?
if merge_base != default_target.sha {
let has_change_id = repo.find_commit(stack.head())?.change_id().is_some();
// If the branch has no change ID for the head commit, we want to rebase it even if the base is the same
// This way stacking functionality which relies on change IDs will work as expected
if merge_base != default_target.sha || !has_change_id {
let new_head = if stack.allow_rebasing { let new_head = if stack.allow_rebasing {
let commits_to_rebase = let commits_to_rebase =
repo.l(stack.head(), LogUntil::Commit(merge_base), false)?; repo.l(stack.head(), LogUntil::Commit(merge_base), false)?;