search

sublimehq / sublime_merge

Issue tracker for Sublime Merge
https://www.sublimemerge.com
273 stars 14 forks source link

SM differes from git status #1136

Open LDAP opened 3 years ago

LDAP commented 3 years ago

Version info

Description

SM differs from git status. Pressing Discard or Stage does nothing.

Steps to reproduce I am not sure how to reproduce this behavior. What I did before it appeared:

  1. Open repository
  2. Stage a bunch of files
  3. Change some staged files
  4. Try to stage them again -> does not work
  5. Commit all files using the command line

Expected behavior SM should show the same changes as git status.

dpjohnst commented 3 years ago

Hi @LDAP,

Thank you for reporting this issue! Would you mind sharing your Sublime Merge debug information for this repository?

This can be found via Help > Debug Information. Before sharing this, please take a moment redact any information you feel is sensitive (email addresses, repo remote URLS, file paths etc).

Additionally, can you confirm whether you have any gitignore, gitattributes, or smudge/clean filters enabled on the repository?

Thanks, - Dylan

LDAP commented 3 years ago 
=== App Version Information ===
Build: 2054

=== Git Version Information ===
Using Git: C:\Program Files\Git\cmd\git.exe (system)
git version 2.29.2.windows.3
PATH: C:\Program Files\Python39\Scripts\;C:\Program Files\Python39\;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.1\bin;C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v10.1\libnvvp;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files (x86)\Common Files\Acronis\VirtualFile\;C:\Program Files (x86)\Common Files\Acronis\VirtualFile64\;C:\Program Files (x86)\Common Files\Acronis\SnapAPI\;C:\Users\Lucas Alber\Documents\Portable Apps\MyPath;C:\Users\Lucas Alber\Documents\Portable Apps\apache-maven-3.6.0\bin;C:\Program Files (x86)\Wolfram Research\WolframScript\;C:\Program Files\MATLAB\R2019b\bin;C:\Program Files\NVIDIA Corporation\Nsight Compute 2019.4.0\;C:\Program Files (x86)\NVIDIA Corporation\PhysX\Common;C:\Program Files\Dart\dart-sdk\bin;C:\Program Files\Intel\WiFi\bin\;C:\Program Files\Common Files\Intel\WirelessCommon\;C:\Strawberry\c\bin;C:\Strawberry\perl\site\bin;C:\Strawberry\perl\bin;C:\Users\Lucas Alber\Documents\Portable Apps\php7.4.3;C:\Program Files\FileBot\;C:\Program Files (x86)\Common Files\Acronis\FileProtector\;C:\Program Files (x86)\Common Files\Acronis\FileProtector64\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\OpenSSL-Win64\bin;c:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;c:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Git\cmd;C:\Program Files\Git\mingw64\bin;C:\Program Files\Git\usr\bin;C:\Program Files\Docker\Docker\resources\bin;C:\ProgramData\DockerDesktop\version-bin;C:\Program Files\NVIDIA Corporation\NVIDIA NvDLISR;C:\Users\Lucas Alber\AppData\Local\Microsoft\WindowsApps;D:\Sourcen\ffmpeg-20191028-68f623d-win64-static\bin;C:\Users\Lucas Alber\Documents\Portable Apps\flutter\bin;D:\Local_Repositories\windows-dev-tools\bins\LLVM\bin;D:\Local_Repositories\windows-dev-tools\bins\texlive\bin\win32;D:\Local_Repositories\windows-dev-tools\bins\jdk\bin;D:\Local_Repositories\windows-dev-tools\bins\node;D:\Local_Repositories\windows-dev-tools\bins\maven\bin;C:\Users\Lucas Alber\AppData\Local\hyper\app-3.0.2\resources\bin;C:\Users\Lucas Alber\AppData\Local\Yarn\bin;

=== Browse Page Information ===
HEAD: 92152bb895b949638f5b744ac28c33d2268f327b
Is in merge: 0
Is in cherry_pick: 0
Is in rebase: 0
Is in revert: 0

=== Git Status Information ===

=== Our Status Information ===

=== Git Config Information ===
branch.feature/<removed>.merge=refs/heads/feature/<removed>
branch.feature/<removed>.remote=origin
branch.master.merge=refs/heads/master
branch.master.remote=origin
color.ui=auto
commit.gpgsign=true
core.autocrlf=input
core.bare=false
core.editor=nano.exe
core.filemode=false
core.fscache=true
core.ignorecase=true
core.logallrefupdates=true
core.repositoryformatversion=0
core.symlinks=false
credential.helper=manager-core
credential.https://dev.azure.com.usehttppath=true
diff.astextplain.textconv=astextplain
filesystem.Oracle Corporation|11.0.1|-1601339972.minracythreshold=0 nanoseconds
filesystem.Oracle Corporation|11.0.1|-1601339972.timestampresolution=6982 microseconds
filter.lfs.clean=git-lfs clean -- %f
filter.lfs.process=git-lfs filter-process
filter.lfs.required=true
filter.lfs.smudge=git-lfs smudge -- %f
gpg.program=gpg
http.sslbackend=schannel
pull.rebase=true
rebase.autostash=true
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=<removed>
tag.forcesignannotated=false
user.email=<removed>
user.name=Lucas Alber
user.signingkey=<removed>

=== Our Config Information ===
Git Config Path Information
Using config path: /C/ProgramData/Git/config
Using config path: /C/Program Files/Git/etc/gitconfig
Using config path: /C/Users/Lucas Alber/.config/git/config
Using config path: /C/Users/Lucas Alber/.gitconfig
Using config path: <removed>

Our config output is different to the Git config output
branch.feature/<removed>.merge=refs/heads/feature/<removed>
branch.feature/<removed>.remote=origin
branch.master.merge=refs/heads/master
branch.master.remote=origin
color.branch=auto
color.diff=auto
color.interactive=true
color.status=auto
color.ui=auto
commit.gpgsign=true
core.autocrlf=input
core.bare=false
core.editor=nano.exe
core.filemode=false
core.fscache=true
core.ignorecase=true
core.logallrefupdates=true
core.repositoryformatversion=0
core.symlinks=false
credential.helper=manager-core
credential.https://dev.azure.com.usehttppath=true
diff.astextplain.textconv=astextplain
filesystem.Oracle Corporation|11.0.1|-1601339972.minracythreshold=0 nanoseconds
filesystem.Oracle Corporation|11.0.1|-1601339972.timestampresolution=6982 microseconds
filter.lfs.clean=git-lfs clean -- %f
filter.lfs.process=git-lfs filter-process
filter.lfs.required=true
filter.lfs.smudge=git-lfs smudge -- %f
gpg.program=gpg
help.format=html
http.sslbackend=schannel
pull.rebase=true
rebase.autosquash=true
rebase.autostash=true
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=<removed>
tag.forcesignannotated=false
user.email=<removed>
user.name=Lucas Alber
user.signingkey=<removed>

=== Git Attributes Information ===
git check_attr --all output

=== Our Modified Files Newline Normalisation and EOL Information ===

=== Our Modified Files Flag Information ===
Ignoring symlinks: 1

.gitignore:

**/target
**/bin
**/.settings
**/.classpath
**/.project

some subdirectories do have this gitattributes:

*               text=auto

*.bash          text eol=lf
*.css           text diff=css
*.df            text
*.htm           text diff=html
*.html          text diff=html
*.java          text diff=java
*.js            text
*.json          text
*.jsp           text
*.jspf          text
*.jspx          text
*.properties    text
*.sh            text eol=lf
*.tld           text
*.txt           text
*.tag           text
*.tagx          text
*.xml           text
*.yml           text

*.class         binary
*.dll           binary
*.ear           binary
*.gif           binary
*.ico           binary
*.jar           binary
*.jpg           binary
*.jpeg          binary
*.png           binary
*.so            binary
*.war           binary

git lfs is active, but not used