sublimehq / sublime_merge

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

`smerge .` Means Open the Current Repository! #1862

Open thoran opened 5 months ago

thoran commented 5 months ago

Version info

Description

Previously smerge . would open the repository but now it presents me with a Open Dialog.

Steps to reproduce

Steps to reproduce the behavior:

  1. Open repository ...
  2. Be presented with an Open Dialog.

Expected behavior

  1. Open repository ...
  2. Be presented with an open 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: === App Version Information === Build: 2091

=== Git Version Information === Using Git: git (system) git version 2.43.0 PATH:

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

=== Git Status Information ===

=== Our Status Information ===

=== Git Config Information === alias.addandcofork=!f(){ git remote add $1 $3; git fetch $1; git checkout --track $1/$2; }; f alias.br=branch alias.branch-name=!git rev-parse --abbrev-ref HEAD alias.branches=!f(){ git branch -a; }; f alias.ci=!f(){ git commit $1 --quiet; }; f alias.co=!f(){ git checkout $1 --quiet; }; f alias.cofork=!f(){ git fetch $1; git checkout --track $2; }; f alias.df=diff alias.fetchfork=!f() { git fetch $1 $2:$2; }; f alias.fetchpr=!f() { git fetch $1 refs/pull-requests/$2/from:pr/$2/from; }; f alias.fresh=!git co main && git pull && git branch --merged | grep -v '*' | xargs -n 1 git branch -d alias.hash=rev-parse HEAD alias.lol=log --oneline alias.lp=log -p alias.pr=pull-request alias.publish=!git push -u origin $(git branch-name) alias.shorthash=rev-parse --short HEAD alias.st=status alias.uncommit=git reset --soft HEAD~1 alias.unstage=reset HEAD -- apply.whitespace=nowarn branch. branch. branch.develop.merge=refs/heads/develop branch.develop.remote=origin color.branch.current=yellow reverse color.branch.local=yellow color.branch.remote=green color.diff.frag=magenta bold color.diff.meta=yellow bold color.diff.new=green bold color.diff.old=red bold color.status.added=yellow color.status.changed=green color.status.untracked=cyan color.ui=auto commit.gpgsign=true commit.template=~/.config/git/commit_template.txt commit.verbose=true core.autocrlf=input core.bare=false core.editor=subl -n -w core.excludesfile=~/.config/git/ignore core.filemode=true core.ignorecase=true core.logallrefupdates=true core.precomposeunicode=true core.quotepath=false core.repositoryformatversion=0 credential.helper=osxkeychain diff.guitool.cmd=opendiff& diff.tool=opendiff diff.tool.sourcetree.tool=opendiff "$LOCAL" "$REMOTE" diff.tool.tool=opendiff difftool.cmd=opendiff& difftool.prompt=false difftool.sourcetree.cmd=opendiff "$LOCAL" "$REMOTE" 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 gpg.program=gpg init.defaultbranch=master merge.guitool.cmd=opendiff& merge.guitool.keepbackup=false merge.tool=opendiff merge.tool.keepbackup=false merge.tool.sourcetree.tool=/Users/thoran/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED" merge.tool.sourcetree.trustexitcode=true merge.tool.tool=opendiff mergetool.cmd=opendiff& mergetool.keepbackup=false mergetool.sourcetree.cmd=/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh "$LOCAL" "$REMOTE" -ancestor "$BASE" -merge "$MERGED" mergetool.sourcetree.trustexitcode=true pull.rebase=true push.default=current rebase.autosquash=true remote.origin.fetch=+refs/heads/:refs/remotes/origin/ remote.origin.url= user.email=code@thoran.com user.name=thoran user.signingkey=

=== Our Config Information === Git Config Path Information Using config path: /opt/homebrew/etc/gitconfig Using config path: /Users/thoran/.config/git/config Using config path: /Users/thoran/.gitconfig Using config path:

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

This section may be omitted/removed.

Screenshots

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

thoran commented 3 months ago

Presently this is the workaround:

  1. From a terminal type open .
  2. From the Finder drag the directory onto the Sublime Merge.app Dock icon and then the repo opens in a new tab/window (the tab/window part is another story) without a dialog.
thoran commented 1 month ago

This seems like a regression to me. Why is it taking so long to fix?

themilkman commented 1 month ago

FWIW, I cannot reproduce this on kubuntu 24.04; Build 2095. Does this also happen when you run smerge --safe-mode . ?

thoran commented 3 days ago

I tried smerge --safe-mode . and that produces the same result. I receive an Open dialog and not an open repository.