sublimehq / sublime_merge

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

The commit history of a branch cannot be displayed #1761

Open chacoo opened 1 year ago

chacoo commented 1 year ago

Version info

Description

The commit history of the branch named R23C02 cannot be displayed. The commit history does exist in the git repo. And it can be displayed in another git tools.

Steps to reproduce

Steps to reproduce the behavior:

Expected behavior

The commit history of the branch can be displayed.

Debug Information === App Version Information === Build: 2083

=== Git Version Information === Using Git: git (system) git version 2.24.3 (Apple Git-128) PATH: /usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/go/bin:/Library/Apple/usr/bin (from shell) environment variables loaded using: /bin/zsh -l

=== Browse Page Information === HEAD: 790bf1ed05fe0e7d476e7b6efc6ac35d96e43374 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 === branch.R23C02.merge=refs/heads/R23C02 branch.R23C02.remote=origin branch.master.merge=refs/heads/master branch.master.remote=origin color.ui=auto commit.template=/Users/chacoo/.stCommitMsg core.bare=false core.excludesfile=/Users/chacoo/.gitignore_global core.filemode=true core.ignorecase=true core.logallrefupdates=true core.precomposeunicode=true core.repositoryformatversion=0 credential.helper=osxkeychain diff.guitool=bc3 diff.tool=bc3 difftool.bc3=trustExitCode difftool.sourcetree.cmd=/usr/local/bin/bcomp "$LOCAL" "$REMOTE" difftool.sourcetree.path=-ro gc.auto=0 http.https://gerrit.googlesource.com.proxy=socks5://127.0.0.1:1081 http.https://github.com.proxy=socks5://127.0.0.1:1081 mergetool.sourcetree.cmd=/usr/local/bin/bcomp "$LOCAL" "$REMOTE" "$BASE" "$MERGED" mergetool.sourcetree.trustexitcode=true remote.origin.fetch=+refs/heads/:refs/remotes/origin/ remote.origin.url=ssh://bob.liu@gerrit.joynile.com:29418/DevOps/Bumblebee user.email=bob.liu@juphoon.com user.name=Bob Liu

=== Our Config Information === Git Config Path Information Using config path: /etc/gitconfig Using config path: /Users/chacoo/.config/git/config Using config path: /Users/chacoo/.gitconfig Using config path: /Users/chacoo/Works/git_root/Bumblebee/.git/config

Our config output is different to the Git config output branch.R23C02.merge=refs/heads/R23C02 branch.R23C02.remote=origin branch.master.merge=refs/heads/master branch.master.remote=origin color.ui=auto commit.template=/Users/chacoo/.stCommitMsg core.bare=false core.excludesfile=/Users/chacoo/.gitignore_global core.filemode=true core.ignorecase=true core.logallrefupdates=true core.precomposeunicode=true core.repositoryformatversion=0 diff.guitool=bc3 diff.tool=bc3 difftool.bc3=trustExitCode difftool.sourcetree.cmd=/usr/local/bin/bcomp "$LOCAL" "$REMOTE" difftool.sourcetree.path=-ro gc.auto=0 http.https://gerrit.googlesource.com.proxy=socks5://127.0.0.1:1081 http.https://github.com.proxy=socks5://127.0.0.1:1081 mergetool.sourcetree.cmd=/usr/local/bin/bcomp "$LOCAL" "$REMOTE" "$BASE" "$MERGED" mergetool.sourcetree.trustexitcode=true remote.origin.fetch=+refs/heads/:refs/remotes/origin/ remote.origin.url=ssh://bob.liu@gerrit.joynile.com:29418/DevOps/Bumblebee user.email=bob.liu@juphoon.com user.name=Bob Liu

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

The commit history is missing is Subime Merge. Screen Shot 2023-05-26 at 2 13 44 PM

The commit history can be displayed in another git tool Screen Shot 2023-05-26 at 2 13 57 PM

dpjohnst commented 1 year ago

Hi @chacoo,

Thanks for reporting this issue - could you confirm:

Thanks, - Dylan from Sublime HQ