Crashes when trying to select or right-click a commit

[FichteFoll]

Version info

• OS: Arch Linux
• Build: 1202

Description

Smerge crashes when I click on a commit in the log, either left or right mouse button. This occured after I checked out a pull request for the Packages repo using Github's new CLI tool gh.

Steps to reproduce

Steps to reproduce the behavior:

1. Open clone of the Packages repo or a fork.
2. Run gh pr checkout 6 using Github's CLI tool
3. Open smerge in that folder
4. Click on a commit.

More information

Debug Info

=== App Version Information ===
Build: 1202

=== Git Version Information ===
Using Git: git (system)
git version 2.25.0
PATH: /home/fichte/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/opt/android-sdk/platform-tools:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/home/fichte/.local/bin:/home/fichte/.cargo/bin:/home/fichte/.gem/ruby/2.5.0/bin

=== Browse Page Information ===
HEAD: 791809246e68fe5cff3018f8a49cb85744b0fd04
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.caa=commit -a --amend -C HEAD
alias.lg=log --graph --oneline --decorate
alias.new=!sh -c 'git log $1@{1}..$1@{0} $@'
alias.pr=!f() { git prr origin $1; } ; f
alias.pr-clean=!git for-each-ref refs/heads/pr/* --format='%(refname)' | while read ref ; do branch=${ref#refs/heads/} ; git branch -D $branch ; done
alias.prr=!f() { git fetch -fu $1 refs/pull/$2/head:pr/$2; } ; f
alias.pru=!f() { git prr upstream $1; } ; f
alias.rebase-terminal=!f() { i3-sensible-terminal -e 'zsh -ic git rebase -i $1'; }; f
branch.autosetuprebase=always
branch.feature/scala.merge=refs/pull/6/head
branch.feature/scala.remote=upstream
branch.merged/json/meta-scopes.merge=refs/heads/javascript_json-meta-scopes
branch.merged/json/meta-scopes.rebase=true
branch.merged/json/meta-scopes.remote=origin
branch.merged/python/mapping-meta-scopes.merge=refs/heads/python_mapping-meta-scopes
branch.merged/python/mapping-meta-scopes.rebase=true
branch.merged/python/mapping-meta-scopes.remote=origin
branch.pr/haskell/misc.merge=refs/heads/pr/haskell/misc
branch.pr/haskell/misc.rebase=true
branch.pr/haskell/misc.remote=origin
commit.gpgsign=true
core.bare=false
core.excludesfile=/home/fichte/.gitignore_global
core.filemode=true
core.logallrefupdates=true
core.repositoryformatversion=0
gc.autodetach=false
log.follow=true
merge.conflictstyle=diff3
merge.tool=smerge
mergetool.smerge.cmd=smerge --wait mergetool "$BASE" "$LOCAL" "$REMOTE" -o "$MERGED"
mergetool.smerge.trustexitcode=true
pull.rebase=true
push.default=simple
rebase.autosquash=true
remote.Thom1729.fetch=+refs/heads/*:refs/remotes/Thom1729/*
remote.Thom1729.url=https://github.com/Thom1729/Packages.git
remote.keith-hall.fetch=+refs/heads/*:refs/remotes/keith-hall/*
remote.keith-hall.url=https://github.com/STealthy-and-haSTy/ShippedPackages
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=git@github.com:FichteForks/Packages.git
remote.upstream.fetch=+refs/heads/*:refs/remotes/upstream/*
remote.upstream.url=git@github.com:sublimehq/Packages.git
user.email=fichtefoll2@googlemail.com
user.name=FichteFoll
user.signingkey=07CD83C5

=== Our Config Information ===
Git Config Path Information
Using config path: /etc/gitconfig
Using config path: /home/fichte/.config/git/config
Using config path: /home/fichte/.gitconfig
Using config path: /home/fichte/code/Packages/.git/config

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 ===

smerge_crash_2020-02-17.txt

[FichteFoll]

FYI, steps to resolve the situation are to just checkout a more recent/the most recent branch.

[dpjohnst]

Thanks for the bug report!

Could you confirm for me whether the crash occurs when viewing (but not checking out) the commit that the PR is pointing to?

[dpjohnst]

Also, which languages does this repository use?

[FichteFoll]

I can't reproduce it on 1204 anymore, so it's probably been fixed. Please close at your discretion.

Also, since this is the Packages repository, it uses … a lot of languages.