Random Staged Files displaying when working directory is clean

[unitof]

Version info

• OS: macOS 14.5 (23F79)
• Build: 2096

Description

Some files in large repo appearing as staged, when Git working directory is clean. Committing behavior itself is correct.

Steps to reproduce

Steps to reproduce the behavior:

1. Open repository homebrew-cask, as cloned from http://github.com/homebrew/homebrew-cask/
2. Even with a clean working directory, SMerge thinks there are a number of staged files with edits. These are all real files in the repo, but which I have not edited or touched.
3. Attempting to commit these (correctly) shows an error.

Screenshots

https://github.com/user-attachments/assets/5b6231c1-5f19-4370-9c03-f6fdd7353c2e

[unitof]

They return instantly when Unstage is clicked.

https://github.com/user-attachments/assets/83cff661-aef5-414f-9d81-e2f2df9e79b6

[dpjohnst]

Hi @unitof,

Thanks for reporting this issue.

When you have a spare moment, could you please share the debug information for the repository:

Debug Information The Sublime Merge debug information can be used to narrow down the cause of an issue. It can be collected with the following steps:

1. Open Sublime Merge
2. Open the repository where the bug occurs
3. Navigate to Help > Debug Information via the application menu
4. Before sharing, please redact any information that's sensitive such as file paths, git user information, remote URLs etc.

Many thanks, - Dylan from Sublime HQ

[harkairt]

I have the same issue, I've removed some info from the dump, but here it is:

=== App Version Information ===
Build: 2096

=== Git Version Information ===
Using Git: git (system)
git version 2.39.1
PATH: /Library/Frameworks/Python.framework/Versions/3.10/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/local/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/bin:/var/run/com.apple.security.cryptexd/codex.system/bootstrap/usr/appleinternal/bin:/Library/Apple/usr/bin:/Applications/Wireshark.app/Contents/MacOS:/opt/homebrew/opt/node@16/bin:/Users/redacted.user/.yarn/bin:/Users/redacted.user/.config/yarn/global/node_modules/.bin:/Users/redacted.user/.nvm/versions/node/v16.13.1/bin:/Library/Frameworks/Python.framework/Versions/3.10/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/Applications/iTerm.app/Contents/Resources/utilities:/Users/redacted.user/.orbstack/bin:/Users/redacted.user/Library/Python/3.10/bin:/Users/redacted.user/Library/Android/sdk/platform-tools:/Users/redacted.user/Library/Android/sdk/cmdline-tools/bin:/users/redacted.user/.pub-cache/bin:/users/redacted.user/stuff/path:/Users/redacted.user/Library/Android/sdk/tools/bin:/Users/redacted.user/Library/Android/sdk/emulator:/Users/redacted.user/Library/Android/sdk/build-tools/31.0.0:/Users/redacted.user/.rvm/bin:/Users/redacted.user/.maestro/bin:/Users/redacted.user/.orbstack/bin (from shell)
environment variables loaded using: /bin/zsh -l

=== Browse Page Information ===
HEAD: 994ea7fef8d0ec0543f8ce832788dee5b0da10c8
Is in merge: 0
Is in cherry_pick: 0
Is in rebase: 0
Is in revert: 0

=== Git Status Information ===

=== Our Status Information ===
A <218 files>

=== Git Config Information ===
branch.develop.github-pr-owner-number=RedactedApp#Redacted_flutter#2659
branch.develop.merge=refs/heads/develop
branch.develop.remote=origin
branch.develop.vscode-merge-base=origin/develop
branch.feat/mutation-provider.github-pr-base-branch=RedactedApp#Redacted_flutter#develop
branch.feat/mutation-provider.merge=refs/heads/feat/mutation-provider
branch.feat/mutation-provider.remote=origin
branch.feat/scan-qr-code.github-pr-owner-number=RedactedApp#Redacted_flutter#2702
branch.feat/scan-qr-code.merge=refs/heads/feat/scan-qr-code
branch.feat/scan-qr-code.remote=origin
branch.feat/scan-qr-code.vscode-merge-base=origin/develop
branch.gitbutler/integration.vscode-merge-base=origin/develop
branch.main.github-pr-owner-number=RedactedApp#Redacted_flutter#1890
branch.main.merge=refs/heads/main
branch.main.remote=origin
branch.staging.github-pr-owner-number=RedactedApp#Redacted_flutter#2660
branch.staging.merge=refs/heads/staging
branch.staging.remote=origin
branch.staging.vscode-merge-base=origin/develop
core.bare=false
core.editor=code --wait
core.filemode=true
core.ignorecase=true
core.logallrefupdates=true
core.pager=cat
core.precomposeunicode=true
core.repositoryformatversion=0
credential.helper=osxkeychain
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
init.defaultbranch=master
lfs.repositoryformatversion=0
log.excludedecoration=refs/gitbutler
maintenance.auto=false
maintenance.repo=/Users/redacted.user/repos/Redacted_flutter
maintenance.strategy=incremental
merge.tool=smerge
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
[email protected]:RedactedApp/Redacted_flutter.git
[email protected]
user.name=harkairt

=== Our Config Information ===
Git Config Path Information
Using config path: /opt/homebrew/etc/gitconfig
Using config path: /Users/redacted.user/.config/git/config
Using config path: /Users/redacted.user/.gitconfig
Using config path: /Users/redacted.user/repos/Redacted_flutter/.git/config

Our config output is identical to the Git config output

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

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

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

[oconnor0]

I am seeing the same behavior on Windows with Sublime Merge, build 2099.

[dpjohnst]

G'day all,

Sorry for the delay while I've investigated this. I believe I've tracked down the cause of this issue finally and should have a fix in the works soon.

Thank you for your patience!

Kind regards, - Dylan from Sublime HQ

[unitof]

I have not seen this in a while! Will reopen if I experience again or if anyone else here comments, but closing for now. Thanks all!

[moll]

Hey,

Just saying I'm seeing the same thing now with Build 2110 on Arch Linux. It seems to happen now consistently when amending a commit. It coincides with messing up the commit history pane, which all of a sudden only displays the last commit on master, and none of its history. Next time it happens, I'll see if the debug info says anything interesting.