Skip to content

Fix: Fixed issue where soft link details were misaligned in git repos #16580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

Fix: Fixed issue where soft link details were misaligned in git repos #16580

Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c895ca3
Fixed Symlink alignment issue
ashrafmansuri Dec 8, 2024
f60e685
Merge branch 'main' into fix-softlinks-git
ashrafmansuri Dec 8, 2024
de849da
Changed to Win32Helper
ashrafmansuri Dec 8, 2024
fa802a7
Changed to Win32Helper
ashrafmansuri Dec 8, 2024
8520721
Revert "Preview: 3.3.5"
ashrafmansuri Dec 8, 2024
c4cb22c
Update to check if isSymLink and not isGitRepo Win32StorageEnumerato…
ashrafmansuri Dec 8, 2024
0952f73
Taking incoming
ashrafmansuri Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,10 @@ CancellationToken cancellationToken
bool isReparsePoint = ((FileAttributes)findData.dwFileAttributes & FileAttributes.ReparsePoint) == FileAttributes.ReparsePoint;
bool isSymlink = isReparsePoint && findData.dwReserved0 == Win32PInvoke.IO_REPARSE_TAG_SYMLINK;

if (isSymlink)
if (isSymlink && !isGitRepo)
{
var targetPath = Win32Helper.ParseSymLink(itemPath);

return new ShortcutItem(null)
{
PrimaryItemAttribute = StorageItemTypes.File,
Expand All @@ -294,7 +294,7 @@ CancellationToken cancellationToken
FileSizeBytes = itemSizeBytes,
TargetPath = targetPath,
IsSymLink = true
};
};
}
else if (FileExtensionHelpers.IsShortcutOrUrlFile(findData.cFileName))
{
Expand Down