sublime_merge
sublime_merge copied to clipboard
Modified submodules not visible when they are the only modification
Version info
- OS: Ubuntu 20.04
- Build: Build 2047
Description
Modified submodules not visible when they are the only modification. If you have a submodule that has been modified and modified changes, then the submodule is shown as has changed.
Steps to reproduce
Steps to reproduce the behavior:
- Create a repo with a submodule. Updated everything.
- Update the submodule to a different commit id.
- You will not see this is sublime merge.
Expected behavior
I would expect to always see modules with changes.
Screenshots
n/a
Hi @psiphi75,
Thank you for sharing this feedback.
When updating a submodule to a different commit, you should see the following in the parent repository:
Is this what you are referring to? If not, could you share a screenshot of what you are referring to.
Kind regards, - Dylan
I can get sublime-merge into a state where it does not match git.
For example running git status
will give me.
On branch master
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
(commit or discard the untracked or modified content in submodules)
modified: aws-iot-device-sdk-cpp-v2 (modified content)
no changes added to commit (use "git add" and/or "git commit -a")
And sublime merge shows the following:
Hi @psiphi75,
Thanks for getting back to me.
Sublime Merge will indicate uncommitted changes to submodules within the Locations
tab.
For example:
The above indicates that there is one uncommitted modified file within the submodule.
Kind regards, - Dylan
Thanks @dpjohnst,
I get it now, but I have to say that's a clear as mud. My default view shows nothing about this, see below.
It would be great to have a submodule behave like a file, and the changes shown in the view in my screenshot immediately above.
Hi @psiphi75,
Thanks for the feedback - I can see how this could be unclear, especially if you've come from the command line. I'll pass this feedback on to the team.
Kind regards, - Dylan
Hello, been quite annoyed with this too recently. This is a new behavior (I would call i regression personnaly) right? because i had those changes visible before and now I don't.
This wasn't obvious to me either!
Any update on this? Seems like a pretty serious issue to not be able to view changes in pull request.