Vscode-gitlens: Interactive rebase editor UI is broken
No errors in devTools console. No errors in GitLens or GitLens (Git) extension output with debug mode on.
- GitLens Version: 11.0.1
- Git Version: 2.25.1
- VSCode Version: 1.51.1 / e5a624b788d92b8d34d1392e4c4d9789406efe8f / x64
- OS Version: Windows 10 (WSL2)
Steps to Reproduce:
- Run
git rebase -i <commit_like> - New tab with title
git-rebase-todowith a broken UI opens (see screenshot)
Logs from GitLens output:
[2020-11-18 09:34:02:600] [1] GitService.initialize
[2020-11-18 09:34:02:600] [2] GitService.getBuiltInGitApi
[2020-11-18 09:34:02:866] [2] GitService.getBuiltInGitApi completed • 265 ms
[2020-11-18 09:34:03:055] Git found: 2.25.1 @ /usr/bin/git • 188 ms
[2020-11-18 09:34:03:055] [1] GitService.initialize completed • 455 ms
[2020-11-18 09:34:03:063] Starting repository search in 1 folders
[2020-11-18 09:34:03:064] [3] GitService.repositorySearch(/home/milos/code/myrepo) searching (depth=1)...
[2020-11-18 09:34:03:064] [4] GitService.getRepoPathCore — e=/home/milos/code/myrepo, t=true
[2020-11-18 09:34:03:070] [5] LineAnnotationController.resume
[2020-11-18 09:34:03:070] [6] GitLineTracker.start
[2020-11-18 09:34:03:070] [6] GitLineTracker.start completed • 0 ms
[2020-11-18 09:34:03:070] [5] LineAnnotationController.resume completed • 0 ms
[2020-11-18 09:34:03:070] [7] LineAnnotationController.refresh
[2020-11-18 09:34:03:071] [8] GitLineTracker.start
[2020-11-18 09:34:03:071] [8] GitLineTracker.start completed • 0 ms
[2020-11-18 09:34:03:071] [9] GitLineTracker.start
[2020-11-18 09:34:03:071] [9] GitLineTracker.start completed • 0 ms
[2020-11-18 09:34:03:081] GitLens (v11.0.1) activated • 483 ms
[2020-11-18 09:34:03:082] [7] LineAnnotationController.refresh completed • 11 ms
[2020-11-18 09:34:03:098] [/home/milos/code/myrepo] git rev-parse --show-toplevel • 33 ms
[2020-11-18 09:34:03:234] [a] RebaseEditorProvider.resolveCustomTextEditor — e=TextDocument(/home/milos/code/myrepo/.git/rebase-merge/git-rebase-todo), version=1, content=pick fbe29451ed ci: add Sentry setup and upload to the CI step for production
pick 9a597d7013 <commit msg 1>
pick 02a2d5b457 <commit msg 2>
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup <commit> = like "squash", but discard this commit's log message
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit
# l, label <label> = label current HEAD with a name
# t, reset <label> = reset HEAD to a label
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
# . create a merge commit using the original merge commit's
# . message (or the oneline, if no original merge commit was
# . specified). Use -c <commit> to reword the commit message.
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# You are editing the todo file of an ongoing interactive rebase.
# To continue rebase after editing, run:
# git rebase --continue
#
# Note that empty commits are commented out
[2020-11-18 09:34:03:356] [4] GitService.getRepoPathCore No symlink detected; repoPath=/home/milos/code/myrepo
[2020-11-18 09:34:03:356] [4] GitService.getRepoPathCore completed • 292 ms
[2020-11-18 09:34:03:356] [3] GitService.repositorySearch(/home/milos/code/myrepo) found root repository in '/home/milos/code/myrepo'
[2020-11-18 09:34:03:357] [b] GitService.repositorySearchCore — e=/home/milos/code/myrepo, t=1
[2020-11-18 09:34:03:358] [c] GitService.repositorySearchCore — e=/home/milos/code/myrepo/apps, t=0
[2020-11-18 09:34:03:362] [c] GitService.repositorySearchCore completed • 4 ms
[2020-11-18 09:34:03:362] [d] GitService.repositorySearchCore — e=/home/milos/code/myrepo/deploy, t=0
[2020-11-18 09:34:03:363] [d] GitService.repositorySearchCore completed • 0 ms
[2020-11-18 09:34:03:363] [e] GitService.repositorySearchCore — e=/home/milos/code/myrepo/dist, t=0
[2020-11-18 09:34:03:363] [e] GitService.repositorySearchCore completed • 0 ms
[2020-11-18 09:34:03:363] [f] GitService.repositorySearchCore — e=/home/milos/code/myrepo/docker, t=0
[2020-11-18 09:34:03:363] [f] GitService.repositorySearchCore completed • 0 ms
[2020-11-18 09:34:03:363] [10] GitService.repositorySearchCore — e=/home/milos/code/myrepo/documentation, t=0
[2020-11-18 09:34:03:363] [10] GitService.repositorySearchCore completed • 0 ms
[2020-11-18 09:34:03:363] [11] GitService.repositorySearchCore — e=/home/milos/code/myrepo/libs, t=0
[2020-11-18 09:34:03:363] [11] GitService.repositorySearchCore completed • 0 ms
[2020-11-18 09:34:03:363] [12] GitService.repositorySearchCore — e=/home/milos/code/myrepo/scripts, t=0
[2020-11-18 09:34:03:368] [12] GitService.repositorySearchCore completed • 5 ms
[2020-11-18 09:34:03:369] [13] GitService.repositorySearchCore — e=/home/milos/code/myrepo/ssl, t=0
[2020-11-18 09:34:03:369] [13] GitService.repositorySearchCore completed • 0 ms
[2020-11-18 09:34:03:369] [14] GitService.repositorySearchCore — e=/home/milos/code/myrepo/tools, t=0
[2020-11-18 09:34:03:369] [14] GitService.repositorySearchCore completed • 0 ms
[2020-11-18 09:34:03:369] [b] GitService.repositorySearchCore completed • 11 ms
[2020-11-18 09:34:03:369] [3] GitService.repositorySearch(/home/milos/code/myrepo) returned 1 repositories (/home/milos/code/myrepo) • 305 ms
[2020-11-18 09:34:03:408] [15] GitService.getRepoPath — e=Uri(file:///home/milos/code/myrepo)
[2020-11-18 09:34:03:408] [16] GitService.getRepository — e=Uri(file:///home/milos/code/myrepo), t={"skipCacheUpdate":true}
[2020-11-18 09:34:03:417] [/home/milos/code/myrepo] git remote -v • 8 ms
[2020-11-18 09:34:03:417] [17] GitRemoteParser.parse completed • 0 ms
[2020-11-18 09:34:03:418] [18] GitService.getRemoteWithApiProvider
[2020-11-18 09:34:03:418] [18] GitService.getRemoteWithApiProvider completed • 0 ms
[2020-11-18 09:34:03:570] [/home/milos/code/myrepo] git ls-files -- /home/milos/code/myrepo • 7 ms
[2020-11-18 09:34:03:570] [19] GitService.isTracked returned true • 7 ms — e=/home/milos/code/myrepo, t=/home/milos/code/myrepo, i={"skipCacheUpdate":true}
[2020-11-18 09:34:03:570] [16] GitService.getRepository returned /home/milos/code/myrepo • 162 ms
[2020-11-18 09:34:03:570] [15] GitService.getRepoPath returned /home/milos/code/myrepo • 162 ms
[2020-11-18 09:34:03:570] [1a] GitService.getBranch — e=/home/milos/code/myrepo
[2020-11-18 09:34:03:570] [1b] GitService.getBranches — e=/home/milos/code/myrepo, t={}
[2020-11-18 09:34:03:596] [/home/milos/code/myrepo] git for-each-ref --format=%3ch%3e%(HEAD)%3cn%3e%(refname)%3cu%3e%(upstream:short)%3ct%3e%(upstream:track)%3cr%3e%(objectname)%3cd%3e%(committerdate:iso8601) refs/heads refs/remotes • 26 ms
[2020-11-18 09:34:03:600] [1c] GitBranchParser.parse completed • 3 ms
[2020-11-18 09:34:03:600] [1d] GitService.getRepository — e=/home/milos/code/myrepo
[2020-11-18 09:34:03:600] [1d] GitService.getRepository returned /home/milos/code/myrepo • 0 ms
[2020-11-18 09:34:03:600] [1b] GitService.getBranches completed • 30 ms
[2020-11-18 09:34:03:600] [1a] GitService.getBranch completed • 30 ms
[2020-11-18 09:34:03:601] [1e] RebaseEditorProvider.parseEntries — e=contents=pick fbe29451ed ci: add Sentry setup and upload to the CI step for production
pick 9a597d7013 <commit msg 1>
pick 02a2d5b457 <commit msg 2>
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup <commit> = like "squash", but discard this commit's log message
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit
# l, label <label> = label current HEAD with a name
# t, reset <label> = reset HEAD to a label
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
# . create a merge commit using the original merge commit's
# . message (or the oneline, if no original merge commit was
# . specified). Use -c <commit> to reword the commit message.
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# You are editing the todo file of an ongoing interactive rebase.
# To continue rebase after editing, run:
# git rebase --continue
#
# Note that empty commits are commented out
[2020-11-18 09:34:03:601] [1e] RebaseEditorProvider.parseEntries completed • 0 ms
[2020-11-18 09:34:03:601] [1f] GitService.getCommit — e=/home/milos/code/myrepo, t=undefined
[2020-11-18 09:34:03:601] [20] GitService.getLog — e=/home/milos/code/myrepo, {"limit":2}
[2020-11-18 09:34:03:607] [/home/milos/code/myrepo] git log --format=%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e --full-history -M -m --name-status -n3 -- • 5 ms
[2020-11-18 09:34:03:607] [21] GitService.getCurrentUser — e=/home/milos/code/myrepo
[2020-11-18 09:34:03:612] [/home/milos/code/myrepo] git config --get-regex user.(name|email) • 4 ms
[2020-11-18 09:34:03:617] [/home/milos/code/myrepo] git check-mailmap Name <[email protected]> • 4 ms
[2020-11-18 09:34:03:617] [21] GitService.getCurrentUser completed • 9 ms
[2020-11-18 09:34:03:617] [22] GitLogParser.parse
[2020-11-18 09:34:03:618] [22] GitLogParser.parse completed • 0 ms
[2020-11-18 09:34:03:618] [20] GitService.getLog completed • 16 ms
[2020-11-18 09:34:03:618] [1f] GitService.getCommit completed • 17 ms
[2020-11-18 09:34:03:619] [23] GitService.getRemoteWithApiProvider
[2020-11-18 09:34:03:619] [23] GitService.getRemoteWithApiProvider completed • 0 ms
[2020-11-18 09:34:03:621] [24] GitService.getCommit — e=/home/milos/code/myrepo, t=02a2d5b457
[2020-11-18 09:34:03:621] [25] GitService.getLog — e=/home/milos/code/myrepo, {"limit":2,"ref":"02a2d5b457"}
[2020-11-18 09:34:03:626] [/home/milos/code/myrepo] git log --format=%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e --full-history -M -m --name-status -n3 02a2d5b457 -- • 5 ms
[2020-11-18 09:34:03:627] [26] GitService.getCurrentUser — e=/home/milos/code/myrepo
[2020-11-18 09:34:03:627] [26] GitService.getCurrentUser completed • 0 ms
[2020-11-18 09:34:03:627] [27] GitLogParser.parse
[2020-11-18 09:34:03:627] [27] GitLogParser.parse completed • 0 ms
[2020-11-18 09:34:03:627] [25] GitService.getLog completed • 6 ms
[2020-11-18 09:34:03:627] [24] GitService.getCommit completed • 6 ms
[2020-11-18 09:34:03:627] [28] GitService.getCommit — e=/home/milos/code/myrepo, t=9a597d7013
[2020-11-18 09:34:03:627] [29] GitService.getLog — e=/home/milos/code/myrepo, {"limit":2,"ref":"9a597d7013"}
[2020-11-18 09:34:03:633] [/home/milos/code/myrepo] git log --format=%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e --full-history -M -m --name-status -n3 9a597d7013 -- • 5 ms
[2020-11-18 09:34:03:633] [2a] GitService.getCurrentUser — e=/home/milos/code/myrepo
[2020-11-18 09:34:03:633] [2a] GitService.getCurrentUser completed • 0 ms
[2020-11-18 09:34:03:633] [2b] GitLogParser.parse
[2020-11-18 09:34:03:633] [2b] GitLogParser.parse completed • 0 ms
[2020-11-18 09:34:03:633] [29] GitService.getLog completed • 5 ms
[2020-11-18 09:34:03:633] [28] GitService.getCommit completed • 5 ms
[2020-11-18 09:34:03:633] [2c] GitService.getRemoteWithApiProvider
[2020-11-18 09:34:03:633] [2c] GitService.getRemoteWithApiProvider completed • 0 ms
[2020-11-18 09:34:03:634] [2d] GitService.getCommit — e=/home/milos/code/myrepo, t=fbe29451ed
[2020-11-18 09:34:03:634] [2e] GitService.getLog — e=/home/milos/code/myrepo, {"limit":2,"ref":"fbe29451ed"}
[2020-11-18 09:34:03:639] [/home/milos/code/myrepo] git log --format=%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e --full-history -M -m --name-status -n3 fbe29451ed -- • 5 ms
[2020-11-18 09:34:03:639] [2f] GitService.getCurrentUser — e=/home/milos/code/myrepo
[2020-11-18 09:34:03:640] [2f] GitService.getCurrentUser completed • 0 ms
[2020-11-18 09:34:03:640] [30] GitLogParser.parse
[2020-11-18 09:34:03:640] [30] GitLogParser.parse completed • 0 ms
[2020-11-18 09:34:03:640] [2e] GitService.getLog completed • 6 ms
[2020-11-18 09:34:03:640] [2d] GitService.getCommit completed • 6 ms
[2020-11-18 09:34:03:641] [a] RebaseEditorProvider.resolveCustomTextEditor completed • 406 ms
Logs from GitLens (Git) output:
[2020-11-18 09:34:03:098] [/home/milos/code/myrepo] git rev-parse --show-toplevel • 33 ms
[2020-11-18 09:34:03:417] [/home/milos/code/myrepo] git remote -v • 8 ms
[2020-11-18 09:34:03:570] [/home/milos/code/myrepo] git ls-files -- /home/milos/code/myrepo • 7 ms
[2020-11-18 09:34:03:596] [/home/milos/code/myrepo] git for-each-ref --format=%3ch%3e%(HEAD)%3cn%3e%(refname)%3cu%3e%(upstream:short)%3ct%3e%(upstream:track)%3cr%3e%(objectname)%3cd%3e%(committerdate:iso8601) refs/heads refs/remotes • 26 ms
[2020-11-18 09:34:03:607] [/home/milos/code/myrepo] git log --format=%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e --full-history -M -m --name-status -n3 -- • 5 ms
[2020-11-18 09:34:03:612] [/home/milos/code/myrepo] git config --get-regex user.(name|email) • 4 ms
[2020-11-18 09:34:03:617] [/home/milos/code/myrepo] git check-mailmap Milos Lajtman <[email protected]> • 4 ms
[2020-11-18 09:34:03:626] [/home/milos/code/myrepo] git log --format=%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e --full-history -M -m --name-status -n3 02a2d5b457 -- • 5 ms
[2020-11-18 09:34:03:633] [/home/milos/code/myrepo] git log --format=%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e --full-history -M -m --name-status -n3 9a597d7013 -- • 5 ms
[2020-11-18 09:34:03:639] [/home/milos/code/myrepo] git log --format=%x3c%x2ff%x3e%n%x3cr%x3e%x20%H%n%x3ca%x3e%x20%aN%n%x3ce%x3e%x20%aE%n%x3cd%x3e%x20%at%n%x3cc%x3e%x20%ct%n%x3cp%x3e%x20%P%n%x3cs%x3e%n%B%n%x3c%x2fs%x3e%n%x3cf%x3e --full-history -M -m --name-status -n3 fbe29451ed -- • 5 ms
miluoshi
All 27 comments
Additional info - the first time I tried to rebase after update of the extension I got it working (but without icons). After restart of vscode on the next rebase I got this.
miluoshi
on 19 Nov 2020
No rebase editor/tab shown at all, in my case.
I go to the "Source Control" pane (since now GitLens is "merged" into that, I like it and didn't switch back), then to the "Branches" section, right-click a branch I started the current one from (after doing some commits on that original branch) and chose "Rebase Current Branch onto Branch..."
Then I get the dropdown menu (where the command palette shows up) with 3 options: "Rebase", "Interactive Rebase" and "Cancel".
If I choose "Interactive Rebase", the VSCode terminal opens and I just get this output:
git rebase --interactive rebase-test
pick 45fcb42 rb2-commit-1
# Rebase 2c7afdc..45fcb42 onto 2c7afdc (1 command)
#
# Commands:
# p, pick <commit> = use commit
# r, reword <commit> = use commit, but edit the commit message
# e, edit <commit> = use commit, but stop for amending
# s, squash <commit> = use commit, but meld into previous commit
# f, fixup <commit> = like "squash", but discard this commit's log message
# x, exec <command> = run command (the rest of the line) using shell
# b, break = stop here (continue rebase later with 'git rebase --continue')
# d, drop <commit> = remove commit
# l, label <label> = label current HEAD with a name
# t, reset <label> = reset HEAD to a label
# m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]
# . create a merge commit using the original merge commit's
# . message (or the oneline, if no original merge commit was
# . specified). Use -c <commit> to reword the commit message.
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
~
~
~
-- INSERT --
and the only thing I can do is either edit it or just :q and then it goes ahead and rebases... I get no visual editor, like shown in this preview: interactive-rebase-editor
MrCroft
on 19 Nov 2020
I encountered the behavior in the OP when trying to rebase using both the --interactive and --preserve-merges options, which I didn't realize was an "incompatible option pair" according to the git docs.
plwalsh
on 20 Nov 2020
No rebase editor/tab shown at all, in my case.
I go to the "Source Control" pane (since now GitLens is "merged" into that, I like it and didn't switch back), then to the "Branches" section, right-click a branch I started the current one from (after doing some commits on that original branch) and chose "Rebase Current Branch onto Branch..."
Then I get the dropdown menu (where the command palette shows up) with 3 options: "Rebase", "Interactive Rebase" and "Cancel".
If I choose "Interactive Rebase", the VSCode terminal opens and I just get this output:git rebase --interactive rebase-test pick 45fcb42 rb2-commit-1 # Rebase 2c7afdc..45fcb42 onto 2c7afdc (1 command) # # Commands: # p, pick <commit> = use commit # r, reword <commit> = use commit, but edit the commit message # e, edit <commit> = use commit, but stop for amending # s, squash <commit> = use commit, but meld into previous commit # f, fixup <commit> = like "squash", but discard this commit's log message # x, exec <command> = run command (the rest of the line) using shell # b, break = stop here (continue rebase later with 'git rebase --continue') # d, drop <commit> = remove commit # l, label <label> = label current HEAD with a name # t, reset <label> = reset HEAD to a label # m, merge [-C <commit> | -c <commit>] <label> [# <oneline>] # . create a merge commit using the original merge commit's # . message (or the oneline, if no original merge commit was # . specified). Use -c <commit> to reword the commit message. # # These lines can be re-ordered; they are executed from top to bottom. # # If you remove a line here THAT COMMIT WILL BE LOST. # # However, if you remove everything, the rebase will be aborted. # ~ ~ ~ -- INSERT --and the only thing I can do is either edit it or just
:qand then it goes ahead and rebases... I get no visual editor, like shown in this preview: interactive-rebase-editor
I encountered with same problem,,,,
guu980-dev
on 20 Nov 2020
@miluoshi can you try with v11.0.2 -- hopefully that will fix the CSP issues
eamodio
on 20 Nov 2020
@MrCroft @guu980-dev your issue is https://github.com/eamodio/vscode-gitlens/issues/1163
eamodio
on 20 Nov 2020
@miluoshi can you try with v11.0.2 -- hopefully that will fix the CSP issues
Interesting. At first, it displayed broken UI with new Disable button
Clicking on Disable did nothing. Then I changed tab (opened settings) and went back to interactive rebase tab and it displayed correctly then.
It looks like it was stuck in some unitialized state and changing tab made it reload or something.
miluoshi
on 20 Nov 2020
Same thing for me. I'm on 11.0.2. Even changing the tabs like for @miluoshi doesn't work for me.
gabrielnemeth
on 21 Nov 2020
@gabrielnemeth what os are you on? Are you connecting to any remote? ssh, wsl, etc? Can you also open up the devtools (open webview developer tools) to see if you see the same csp error?
eamodio
on 21 Nov 2020
I'm on Windows 10 v. 2004. I'm using WSL2. When I open the dev tools I can see an error:
gabrielnemeth
on 21 Nov 2020
Hrm, that error always happens (not related to GitLens). Can you switch to the network tab of the devtools and hit F5 to refresh the webview? And see if any requests fail?
Also do you see any errors on the Output pane for GitLens?
eamodio
on 21 Nov 2020
Everything looks fine to me. No error whatsoever neither in network nor in the output pane.
gabrielnemeth
on 21 Nov 2020
Does it happen on any rebase or specific to a set of commit or project?
eamodio
on 21 Nov 2020
It does happen in all projects under wsl2. If I'm under "pure" windows I can't open the rebase editor, since every time I type the rebase command in powershell, it opens the vim version in the terminal.
gabrielnemeth
on 21 Nov 2020
@gabrielnemeth I'm really at a loss. I can't reproduce any issue with the rebase editor not loading over WSL (or any other case). Can you try uninstalling GitLens from WSL and re-installing it?
Though the other issue you mention will be resolved with: #1163
eamodio
on 22 Nov 2020
I think I got it. I think it's a resolution related issue. The issue is present on 4k, but if I change my laptop's resolution to full HD it works just fine.
gabrielnemeth
on 22 Nov 2020
It happened to me again today. I don't have 4k monitor, if that helps.
The worst thing is I even can't disable interactive rebase editor with proposed solution - when I rebase through UI it opens broken editor. Only option for me is to run rebase from terminal.
miluoshi
on 23 Nov 2020
I'm using WSL and have the same problem. On the same version, everything was fine yesterday, today the rebase is broken. Same with settings:
hi0t
on 26 Nov 2020
Is anyone who is able to reproduce this able to debug into it? I can't reproduce this at all, locally, over WSL or any other remote. I'm really at a loss. It feels like this may be a VS Code bug, but not sure.
/cc @mjbvz have you seen anything like this?
eamodio
on 2 Dec 2020
I think I know. If the extension is installed locally and remotely then everything is fine. If the extension is installed only remotely, the settings and rebase interfaces are broken. At least that's the case for me.
hi0t
on 2 Dec 2020
Great information! I will try that scenario out. Thank you!
eamodio
on 2 Dec 2020
@hi0t How do you actually get it to not be installed locally? Are you manually uninstalling it locally after installing it in the remote?
eamodio
on 2 Dec 2020
I still can't reproduce this 😢
eamodio
on 2 Dec 2020
I'm thinking this must be a vscode bug -- does this issue align with any of you experiencing this: https://github.com/microsoft/vscode/issues/103884?
Are you using WSL1 or 2 (I've been testing with 2), do you have a VPN or other special networking? We really need to find some way to reproduce this.
eamodio
on 2 Dec 2020
If you are hitting this issue, besides the steps @eamodio mentioned, please also try setting "webview.experimental.useIframes": true in your vscode settings.json file and then reloading VS Code.
This changes the implementation of VS Code's webviews (which power the rebase editor). If the webview works with iframes enabled, we at least know where to start looking in the code
mjbvz
on 3 Dec 2020
Sweet without "webview.experimental.useIframes": true in my settings I can reproduce it!
eamodio
on 3 Dec 2020
Here is my extensions config:
And I am using outbound vpn connection. In theory, VPN can influence. Because among the secured routes there are subnets:
172.17.0.0/16
172.19.0.0/16
172.20.0.0/16
hi0t
on 3 Dec 2020
Related issues
Ardeshir81
·
3Comments
ridhwaans
·
3Comments
batjko
·
4Comments
robertzauner
·
3Comments
vgrafe
·
3Comments
Most helpful comment
@MrCroft @guu980-dev your issue is https://github.com/eamodio/vscode-gitlens/issues/1163