Skip to content
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.

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

stash pop hits bug in git 2.24.0 #615

Closed
stevenkaras opened this issue Nov 13, 2019 · 11 comments
Closed

stash pop hits bug in git 2.24.0 #615

stevenkaras opened this issue Nov 13, 2019 · 11 comments

Comments

@stevenkaras
Copy link

Version info

  • OS: Ubuntu 16.04
  • Build: 1119
  • Git: 2.24.0

Description

When editing commit messages, I have a habit of hitting ctrl+s. After upgrading git to the latest version, there is apparently an issue with git stash and the --quiet flag. The gist of the bug is that it clears the index, making it appear that all the files in the repository have been removed. This leads to SublimeMerge listing every single file as removed and for large repositories causes a huge spike in memory usage (for reference, this happened in our monorepo and SM jumped from ~160MB resident to around 2.4GB).

I don't necessarily expect SublimeMerge to do anything with this bug, but hopefully it will be easier to discover than the git bug and show up in search results and save someone else searching for the relevant bug reports for an hour.

Steps to reproduce

Steps to reproduce the behavior:

  1. Make some changes in a repository.
  2. Stash those changes
  3. Pop the stash
@Bjarno
Copy link

Bjarno commented Nov 14, 2019

The same issue is happening on my system. Really confusing behavior of Sublime Merge.

@stdedos
Copy link

stdedos commented Nov 20, 2019

I don't necessarily expect SublimeMerge to do anything with this bug

I would expect that I could "hack" the command not to be quiet, for the time being :-D

@stevenkaras
Copy link
Author

Looks like there is an actual bug here:

sublime-merge-stash-pop

it should show that it's running git stash pop -q

@mwean
Copy link

mwean commented Dec 20, 2019

This is happening for me also, and it usually crashes the app. I use stashes all the time in Tower, and I've never had this issue, so there must be some way around it.

@themilkman
Copy link

I also saw this behavior under linux. I'd hope that the git devs will respolve it soon.

@martijnboers
Copy link

Also affected, subscribing

@themilkman
Copy link

If I see it correctly (couldn't test it yet) it should be resolved in git 2.25 (see https://github.com/git/git/blob/v2.25.0/Documentation/RelNotes/2.25.0.txt )

@themilkman
Copy link

Could just test it, works on my Linux machine as expected again with git 2.25 👍

@stdedos
Copy link

stdedos commented Jan 15, 2020

It is so lovely that no-one from the team is responding here ❤️

Sublime Text repositories are much more responsive/active, which makes this strange.

@stevenkaras
Copy link
Author

Looks like this was resolved in sublime merge build 2020 with the release note:

image

Closing this as a result.

@themilkman
Copy link

Just for the records, respectively fixed on the dev Build 1201 in February :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

6 participants