gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-06 01:27:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

resetHeadCommit to handle single commit reset

Browse Source
This commit is contained in:
Nikita Galaiko 2023-10-12 08:38:22 +02:00 committed by GitButler
parent a5d898182a
commit f65c5cad21
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/ui/src/routes/repo/[projectId]/BranchLane.svelte
View File

@ -200,15 +200,19 @@
}
function resetHeadCommit() {
if (branch.commits.length < 2) {
return;
if (branch.commits.length > 1) {
branchController.resetBranch({
projectId,
branchId: branch.id,
targetCommitOid: branch.commits[1].id
});
} else if (branch.commits.length === 1 && base) {
branchController.resetBranch({
projectId,
branchId: branch.id,
targetCommitOid: base?.baseSha
});
}
branchController.resetBranch({
projectId,
branchId: branch.id,
targetCommitOid: branch.commits[1].id
});
}
onMount(() => {