Open Chris-May opened 2 weeks ago
Additionally, Sublime Merge is listing six staged files that don't exist.
Screenshot:
Git status:
> git status
On branch main
Your branch is up to date with 'origin/main'.
Untracked files:
(use "git add <file>..." to include in what will be committed)
tests/e2e/
nothing added to commit but untracked files present (use "git add" to track)
Version info
Description The commit history looks corrupted in one of my repos.
Today's commits are fine, but anything before that is gone. See screenshot:
My git history is intact:
It seems to me like there's some kind of corrupt cache within Sublime Merge, since it's just this repository, and I can see the history in other git clients. I can't find a way to refresh it.
Debug Information
Debug info
``` === App Version Information === Build: 2096 === Git Version Information === Using Git: git (system) git version 2.41.0 PATH: /Users/chris/.pyenv/shims:/Users/chris/tools:/Users/chris/.local/bin:/opt/homebrew/sbin:/opt/homebrew/bin:/Users/chris/.pyenv/bin:/opt/homebrew/bin/pyenv:/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:/Library/TeX/texbin:/Applications/PyCharm.app/Contents/MacOS (from shell) environment variables loaded using: /opt/homebrew/bin/fish -l === Browse Page Information === HEAD: ecf7d45d2650d4629042f7529e71f8326313c458 Is in merge: 0 Is in cherry_pick: 0 Is in rebase: 0 Is in revert: 0 === Git Status Information === ?? tests/e2e/ === Our Status Information === A data/groceries.txt A src/groceries/adapters/__init__.py A src/groceries/adapters/repository.py A src/groceries/domain/__init__.py A src/groceries/domain/events.py A src/groceries/domain/models.py ?? tests/e2e/__init__.py ?? tests/e2e/test_create_list.py === Git Config Information === alias.gpf=git push --force-with-lease --force-if-includes alias.stash=stash --all branch.main.merge=refs/heads/main branch.main.remote=origin branch.sort=-committerdate column.ui=auto core.autocrlf=input core.bare=false core.excludesfile=~/.gitignore core.filemode=true core.ignorecase=true core.logallrefupdates=true core.precomposeunicode=true core.repositoryformatversion=0 credential.helper=osxkeychain help.autocorrect=20 init.defaultbranch=main maintenance.auto=false maintenance.strategy=incremental pull.rebase=true remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* remote.origin.url=