gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-09-19 16:17:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug where occasionally locked commit info is missing

Browse Source 
- happens when the commit is already pushed
This commit is contained in:
Mattias Granlund 2024-04-16 10:24:05 +02:00
parent 203da38e8b
commit dd755d18ac
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/lib/components/FileStatusIcons.svelte
View File

@ -3,7 +3,7 @@
import Icon from '$lib/components/Icon.svelte';
import { computeFileStatus } from '$lib/utils/fileStatus';
import { tooltip } from '$lib/utils/tooltip';
import { getLocalCommits } from '$lib/vbranches/contexts';
import { getLocalCommits, getRemoteCommits } from '$lib/vbranches/contexts';
import { getLockText } from '$lib/vbranches/tooltip';
import { type AnyFile, LocalFile } from '$lib/vbranches/types';
@ -11,9 +11,13 @@
// TODO: Refactor this into something more meaningful.
const localCommits = file instanceof LocalFile ? getLocalCommits() : undefined;
const remoteCommits = file instanceof LocalFile ? getRemoteCommits() : undefined;
$: lockedIds = file.lockedIds;
$: lockText = lockedIds.length > 0 && $localCommits ? getLockText(lockedIds, $localCommits) : '';
$: lockText =
lockedIds.length > 0 && $localCommits
? getLockText(lockedIds, ($localCommits || []).concat($remoteCommits || []))
: '';
</script>
<div class="file-status">