gitattributes file for the repository in question? gitignore file in the repository? If so, could you share the contents of it? Is this a public repository that you're seeing this issue on?.We're still actively investigating this issue but unfortunately have been unable to reproduce the issue despite extensive testing on multiple Windows What version of Windows are you on? Is it 64-bit? # Scenes are stored as text, will not be merged, and can be locked # Text formatted Unity assets which should not have line endings messed with # Actual text files which should get line endings nornalized # Dot files presumed git config files and similar - in either case text LockableUnmergedText filter=text diff=text merge=binary lockable UneditedText filter=text diff=text merge=text # By default, everything is in LFS and does not get line endings normalizedĮditedText filter=text diff=text merge=text text=auto Not sure what the difference is between these two builds. Perhaps the clean and smudge filter fix needs to be revised?įor now I've downgraded to build 2046 as a workaround.Įdit: apparently build 2047 also works, I guess this is a release of the 2046 dev build. Windows: fixed clean and smudge filters hanging on certain files Windows and Mac: updated bundled Git to 2.30.2 (addresses CVE-2021-21300) The changelog of build 2048 states (bolding mine):Īllow command palette navigation with Tab / Shift Tabįixed newlines appearing in the commit message historyįixed blame tooltips not updating in certain circumstancesįixed crash when staging files with certain file encodings In my tests I always set the SM preferences to use system git to rule out any issues with the bundled git version.įrom build 2048 onwards every version has the issue as described above. This is the git status -vvv output from git bash:Īfter trying out different builds from the dev download page I found that (on Windows) build 2046 is the last build that does not hang on a git LFS repository. = Our Modified Files Newline Normalisation and EOL Information = Our config output is identical to the Git config output Using config path: /C/Users/user/repos/models/script/.git/config Using config path: /C/Users/user/.gitconfig Using config path: /C/Users/user/.config/git/config Using config path: /C/Program Files/Git/etc/gitconfig Using config path: /C/ProgramData/Git/config = refs/heads/ *:refs/remotes/origin/ Our Config Information = ='C:/Users/user/AppData/Local/Programs/WinMerge/WinMergeU.exe' -wl -wm -dl Remote -dm Base -dr Local $REMOTE $BASE $LOCAL -o $MERGED Http.sslcainfo=C:/Program Files/Git/mingw64/ssl/certs/ca-bundle.crt HEAD: f04e9a0a3f0bffa4f0dedb6388fffe33470a6e33ī=refs/heads/sim-outboundĬore.excludesfile=C:\Users\user\OneDrive - company\Other\gitignore_global.txtĭ='C:/Users/user/AppData/Local/Programs/WinMerge/WinMergeU.exe' " $LOCAL" " $REMOTE"į=git-lfs filter-process PATH: C:\Program Files (x86)\Common Files\Oracle\Java\javapath C:\Program Files\AdoptOpenJDK\jdk-16.0.1.9-hotspot\bin C:\lib C:\WINDOWS\system32 C:\WINDOWS C:\WINDOWS\System32\Wbem C:\WINDOWS\System32\WindowsPowerShell\v1.0\ C:\WINDOWS\System32\OpenSSH\ C:\ProgramData\chocolatey\bin C:\Program Files\MiKTeX 2.9\miktex\bin\圆4\ C:\Strawberry\c\bin C:\Strawberry\perl\site\bin C:\Strawberry\perl\bin C:\Program Files\Matlab\R2020a\runtime\win64 C:\Program Files\Matlab\R2020a\bin C:\Program Files\Microsoft VS Code\bin C:\Program Files\dotnet\ %USERPROFILE%\.dnx\bin C:\Program Files\Microsoft DNX\Dnvm\ C:\Program Files\Microsoft SQL Server\130\Tools\Binn\ C:\tools\BCURRAN3 C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\ C:\Program Files\Git\cmd C:\Program Files\nodejs\ C:\Program Files\Git LFS C:\Users\user\AppData\Local\Microsoft\WindowsApps C:\Users\user\AppData\Local\Pandoc\ C:\Program Files\Sublime Merge C:\Program Files\heroku\bin c:\Users\user\Apps\bin\ C:\Users\user\AppData\Roaming\npm With the top-level structure being an array.Using Git: C:\Program Files\Git\cmd\git.exe (system) Menus in Sublime Merge are defined by files ending in
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |