sublime_merge icon indicating copy to clipboard operation
sublime_merge copied to clipboard

Modified submodules not visible when they are the only modification

Open psiphi75 opened this issue 3 years ago • 8 comments

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:

  1. Create a repo with a submodule. Updated everything.
  2. Update the submodule to a different commit id.
  3. You will not see this is sublime merge.

Expected behavior

I would expect to always see modules with changes.

Screenshots

n/a

psiphi75 avatar Mar 07 '21 22:03 psiphi75

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: Submodule

Is this what you are referring to? If not, could you share a screenshot of what you are referring to.

Kind regards, - Dylan

dpjohnst avatar Mar 08 '21 02:03 dpjohnst

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: image

psiphi75 avatar Mar 08 '21 04:03 psiphi75

Hi @psiphi75,

Thanks for getting back to me.

Sublime Merge will indicate uncommitted changes to submodules within the Locations tab.

For example: Unstaged changes

The above indicates that there is one uncommitted modified file within the submodule.

Kind regards, - Dylan

dpjohnst avatar Mar 08 '21 04:03 dpjohnst

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. image

It would be great to have a submodule behave like a file, and the changes shown in the view in my screenshot immediately above.

psiphi75 avatar Mar 08 '21 04:03 psiphi75

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

dpjohnst avatar Mar 08 '21 05:03 dpjohnst

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.

chboing avatar Apr 26 '21 08:04 chboing

This wasn't obvious to me either!

anacrolix avatar Mar 24 '22 09:03 anacrolix

Any update on this? Seems like a pretty serious issue to not be able to view changes in pull request.

Screenshot 2022-11-11 at 11 54 30

ian-steffy avatar Nov 11 '22 10:11 ian-steffy