search

sublimehq / sublime_merge

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

Trying to `git stash apply` a stash into big unstaged conflicting changes freezes gnome-shell #1965

Open stdedos opened 2 months ago

stdedos commented 2 months ago

Version info

Description

A description of what the bug is.

I have the following unstaged changes:

 2083 files changed, 168676 insertions(+), 107762 deletions(-)

I am trying to apply a -9 +159 stash, that has (3) conflicts with the above changes.

Very soon after that operation, gnome-shell is frozen (e.g. clock is not running)

Killing sublime-merge (via a different tty) takes down gnome-shell (and gnome-terminal for that matter)

(Repository cannot be shared. Feel free to ask for metrics though.)

Steps to reproduce

Steps to reproduce the behavior:

  1. Open repository ...
  2. Run command ...
  3. Click on ...

Expected behavior

A description of what you expected to happen.

gnome-shell would not freeze / crash as a result of this

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.

This section may be omitted/removed.

Screenshots

If applicable, add screenshots to help explain your problem. This section may be omitted/removed.

dpjohnst commented 2 months ago

Hi @stdedos,

Thanks for reaching out and sorry to hear you're seeing this issue. When you have a spare moment, could you confirm if applying the stash via the command line (using the git stash pop command) also produces this same freezing behavior?

Kind regards, - Dylan from Sublime HQ

stdedos commented 1 month ago

It doesn't happen. That's how I moved on - did the command (and its resolution) by terminal.

I think it may be related to the fact that, the stash being popped causes conflicts, and Sublime Merge produces the "command failed" "popup".

In that, there is also the git status output, which is humongous (given 2k files).

My screen layout is two WQHD monitors, and in the middle of them (from below) there is a 1920x1200 screen.

dpjohnst commented 3 weeks ago

Hi @stdedos,

Thank you for confirming this and for your patience while this is investigated. I'll provide another update once I've tracked down the cause of this issue.

Kind regards, - Dylan from Sublime HQ