GitLens Version

v12.1.2

VS Code Version

Version : 1.70.0
Validation : da76f93349a72022ca4670c1b84860304616aaa2
Date : 2022-08-04T04:39:20.716Z (il y a 5 jours)
Electron : 18.3.5
Chromium: 100.0.4896.160
Node.js : 16.13.2
V8 : 10.0.139.17-electron.0
Système d’exploitation : Darwin arm64 21.5.0

Git Version

git version 2.37.0 (mac os)

Description

Hi

Right now in my ~/.gitconfig file, I have the following entries :

[color]
        ui = auto
[core]
        autocrlf = input
        editor = code --wait
[diff]
    tool = default-difftool
[difftool "default-difftool"]
    cmd = code --wait --diff $LOCAL $REMOTE
[rebase]
        autoSquash = true
[pull]
        rebase = false

As you can see, I'm relying on VSC to edit my rebases, especially when performing them in a shell outside of VSC.

Also notice that I'm using much the git --fixup option upon comits, and that's why I've added the

[rebase]
        autoSquash = true

It seems that the trouble I'm encountering appeared since GitLens UI became the default one to display git rebase "scripts".

Bug Description :

Now, half of the time, when I start an interactive rebase from outside of VSC, the GitLens UI is displaying empty list of modifications whereas they are some :

Can't tell much more about it, as I don't really understand what is triggering this trouble.

Previous to GitLens UI been the default rebase one, everything was working fine.

Nevertheless, notice that I can't tell if it's due to GitLens, or something else that would have been delivered at the same time or close to it, in a former version of VSC

And, last but not least :
Fortunately, as most of the time I have nothing to change due to the use of autoSquash = true option, closing the empty rebase tab is enough to still have the rebase processed the right way from the external git command.

The only drawback in that specific case that a popup window is warning me that modifications are left pending and is asking me, amongst other things, if I want to skip recording them :

This is this option I choose and is working for my use case.

Logs, Screenshots, Screen Captures, etc

see above the attached screenshots.