sublimehq / sublime_merge

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

Create Branch on Commit doesn't accept Enter sometimes #1977

Open direc85 opened 4 days ago

direc85 commented 4 days ago

Version info

Description

Sometimes it's not possible to create a branch at commit. Enter key doesn't seem to have any effect.

This can usually be mitigated by closing and re-opening Sublime Merge and trying the operation again.

This is how I start Sublime Merge:

  1. Open Konsole
  2. ssh-add the key to agent
  3. cd to the repo dir
  4. Open the repo with smerge . (or just smerge)

I am using Fish Shell but as mentioned, this only happens sometimes, and restarting Sublime Merge from the very same shell makes it work again.

Steps to reproduce

Steps to reproduce the behavior:

  1. Open repository
  2. Checkout e.g. main
  3. Right-click on the commit, select Create Branch at Commit
  4. Type a name in the UI element, e.g. qwerty
  5. Press Enter

Expected behavior

The branch is created and checked out.

Actual behavior

Enter does nothing, no branch is created, UI element is still visible.

Debug Information

=== App Version Information ===
Build: 2102

=== Git Version Information ===
Using Git: git (system)
git version 2.47.0
PATH: /home/matti/.local/bin/:/home/matti/SailfishOS/bin/:/home/matti/.cargo/bin:/home/matti/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/usr/lib/rustup/bin

=== Browse Page Information ===
HEAD: 4bdd8a103e211982e920e08615186711ba34e31e
Is in merge: 0
Is in cherry_pick: 0
Is in rebase: 0
Is in revert: 0

=== Git Status Information ===
 M rpm/harbour-whisperfish.spec

=== Our Status Information ===
 M rpm/harbour-whisperfish.spec

=== Git Config Information ===
branch.attachments-v4.vscode-merge-base=origin/main
branch.debug-flag.merge=refs/heads/debug-flag
branch.debug-flag.remote=origin
branch.debug-flag.vscode-merge-base=origin/main
branch.gstreamer-compression.merge=refs/heads/gstreamer-compression
branch.gstreamer-compression.remote=origin
branch.improve-session-not-found.merge=refs/heads/improve-session-not-found
branch.improve-session-not-found.remote=origin
branch.improve-session-not-found.vscode-merge-base=origin/main
branch.libsignal-0.56.1.merge=refs/heads/libsignal-0.56.1
branch.libsignal-0.56.1.remote=origin
branch.libsignal-0.56.1.vscode-merge-base=origin/main
branch.main.merge=refs/heads/main
branch.main.remote=origin
branch.main.vscode-merge-base=origin/main
branch.mitigate-chat-text-input.merge=refs/heads/mitigate-chat-text-input
branch.mitigate-chat-text-input.remote=origin
branch.mitigate-chat-text-input.vscode-merge-base=origin/main
branch.pni-uuid-backup.vscode-merge-base=origin/main
branch.registration-lock-message.merge=refs/heads/registration-lock-message
branch.registration-lock-message.remote=origin
branch.session-records-pk-bak.vscode-merge-base=origin/main
branch.staging-server.merge=refs/heads/staging-server
branch.staging-server.remote=origin
branch.staging-server.vscode-merge-base=origin/main
branch.voice-call.merge=refs/heads/voice-call
branch.voice-call.remote=origin
branch.voice-call.vscode-merge-base=origin/voice-call
branch.voices.vscode-merge-base=origin/main
commit.gpgsign=false
core.bare=false
core.editor=/usr/bin/nvim
core.filemode=true
core.logallrefupdates=true
core.repositoryformatversion=0
credential.https://github.com.helper=!/usr/bin/gh auth git-credential
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
maintenance.repo=/home/matti/SFOS/whisperfish
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=git@gitlab.com:whisperfish/whisperfish.git
user.email=[REDACTED]
user.name=Matti Viljanen
user.signingkey=[REDACTED]

=== Our Config Information ===
Git Config Path Information
Using config path: /etc/gitconfig
Using config path: /home/matti/.config/git/config
Using config path: /home/matti/.gitconfig
Using config path: /home/matti/SFOS/whisperfish/.git/config

Our config output is identical to the Git config output

=== Git Attributes Information ===
git check_attr --all output
rpm/harbour-whisperfish.spec

=== Our Modified Files Newline Normalisation and EOL Information ===
rpm/harbour-whisperfish.spec: unspecified - native

=== Our Modified Files Flag Information ===
Ignoring symlinks: 0
rpm/harbour-whisperfish.spec: Working - Normal File : Index - Normal File

=== Staged Files Information ===

=== Repository Statistics ===
Commit Count: 2774
Untracked Files Count: 0
Modified Files Count: 1
Staged Files Count: 0
Submodule Count: 0
Loose Objects Count: 5885
Packfile Count: 13
dpjohnst commented 2 days ago

Hi @direc85,

Thanks for reaching out and sorry to hear you're experiencing this issue.

I've been unable to reproduce this issue so far, but will be investigating further.

Kind regards, - Dylan from Sublime HQ

direc85 commented 1 day ago

Thanks for the reply. It only happens sometimes, maybe once or twice every week or so.

I have another setup that also presents the issue, I think. I'll add the details from it if/when it happens.