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

Fix trunk not displaying

Browse Source
This commit is contained in:
Caleb Owens 2024-05-27 11:42:43 +02:00
parent 94f34ba1d4
commit a0c29be88e
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/lib/components/CommitDragItem.svelte
View File

@ -3,7 +3,7 @@
import { Project } from '$lib/backend/projects';
import { DraggableCommit, DraggableFile, DraggableHunk } from '$lib/dragging/draggables';
import { dropzone } from '$lib/dragging/dropzone';
import { getContext, getContextStore } from '$lib/utils/context';
import { getContext, maybeGetContextStore } from '$lib/utils/context';
import { BranchController } from '$lib/vbranches/branchController';
import { filesToOwnership, filesToSimpleOwnership } from '$lib/vbranches/ownership';
import { RemoteCommit, Branch, Commit, LocalFile, RemoteFile } from '$lib/vbranches/types';
@ -12,9 +12,11 @@
const branchController = getContext(BranchController);
const project = getContext(Project);
const branch = getContextStore(Branch);
const branch = maybeGetContextStore(Branch);
function acceptAmend(commit: Commit | RemoteCommit) {
if (!$branch) return;
if (commit instanceof RemoteCommit) {
return () => false;
}
@ -38,6 +40,8 @@
}
function onAmend(commit: Commit | RemoteCommit) {
if (!$branch) return;
return (data: any) => {
if (data instanceof DraggableHunk) {
const newOwnership = `${data.hunk.filePath}:${data.hunk.id}`;
@ -59,6 +63,8 @@
}
function acceptSquash(commit: Commit | RemoteCommit) {
if (!$branch) return;
if (commit instanceof RemoteCommit) {
return () => false;
}
@ -81,6 +87,8 @@
}
function onSquash(commit: Commit | RemoteCommit) {
if (!$branch) return;
if (commit instanceof RemoteCommit) {
return () => false;
}