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

Use correct headers for unapplying wip commits

Browse Source
This commit is contained in:
Caleb Owens 2024-07-02 17:30:00 +02:00
parent 0408f5ec11
commit 49236707be
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crates/gitbutler-core/src/virtual_branches/virtual.rs
View File

@ -3506,20 +3506,13 @@ pub fn create_virtual_branch_from_branch(
{
let head_commit = repo.find_commit(branch.head)?;
if let Some(header) = head_commit.raw_header() {
if header
.lines()
.any(|line| line.starts_with("gitbutler-vbranch"))
{
if let Some(branch_name) = header
.lines()
.find(|line| line.starts_with("gitbutler-vbranch-name"))
.and_then(|line| line.split_once(' '))
.map(|(_, name)| name.to_string())
{
if let Some(headers) = head_commit.gitbutler_headers() {
if headers.is_unapplied_header_commit {
if let Some(branch_name) = headers.vbranch_name {
branch.name = branch_name;
vb_state.set_branch(branch.clone())?;
}
};
undo_commit(project_repository, branch_id, branch.head)?;
}