Skip to content

Unmodified submodules marked unstaged #18

@sadlerjw

Description

@sadlerjw

Sublime Merge is marking a bunch of submodules as being changed, even though they don't have unstaged changes and haven't been changed to a different commit. git on the command line does not list them as changed. Pressing "Stage" in Merge removes them from the screen (IE, they do not move to the Staged area, they just disappear) but refreshing or restarting Merge puts them back in place.

I'm on macOS 10.13.6 and Sublime Merge build 1058. IIRC this was working fine on yesterday's build.

I've witnessed this problem on two different repos.
I tried to reproduce by adding a submodule to a brand new repository, but everything worked fine there.

untitled

Command line git:

$ git status
On branch jason/ios12
Your branch is ahead of 'origin/jason/ios12' by 1 commit.
  (use "git push" to publish your local commits)

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
  (commit or discard the untracked or modified content in submodules)

    modified:   <<redacted A>>
    modified:   <<redacted B>>
    modified:   <<redacted C>>
    modified:   <<redacted D>>
    modified:   <<redacted E>>
    modified:   <<redacted F>>
    modified:   ../submodules/<<redacted G - does not appear in Sublime Merge>> (modified content)

no changes added to commit (use "git add" and/or "git commit -a")

$ git submodule
 8dd19b95d7efa96c7bd3ba37ac6c457b98ead620 ../submodules/ACTabScrollView (v0.2.6-25-g8dd19b9)
 e0070a9ecc6a624e7053b676ff1670e876eb17f5 ../submodules/AFNetworking (2.6.3-1-ge0070a9)
 763ed24bf54f1d9ba1153429af47ce9801a4f728 ../submodules/CocoaLumberjack (2.0.2-183-g763ed24)
 2004eadfb2c0d782b59a3317466b726a9076c38b ../submodules/<<redacted X>> (heads/master)
 ad0eedc6296dd8880629da26132c8c1e91f08c6c ../submodules/EasyTipView (0.1.2-56-gad0eedc)
 983e7ad990e9902930126c00d3dc698aa8ad656e ../submodules/OvershareKit (1.3.1-33-g983e7ad)
 9b5e5890297b94a8b1a474ac7bf4c1b8c2e5f8d7 ../submodules/RFQuiltLayout (1.0.2-51-g9b5e589)
 b52b21c04115be64d9aa99b6cee10d27e1d27269 ../submodules/SwiftFSM (v1.0-1-gb52b21c)
 1fadc548c91ae7bf09f4029f535439e1eba56110 ../submodules/TLYShyNavBar (1.0.1-29-g1fadc54)
 0c8a357c8418da2de1030ad85be504c992fca1b6 ../submodules/UPCarouselFlowLayout (1.1.1-2-g0c8a357)
 d74cf0a1a5443b5fb282c8e5faca729fb6c2f6b5 ../submodules/<<redacted G>> (heads/jason/iphone-x)
 9ccaa8ec796417c15517e88c32d58c78aaa00eea ../submodules/tensorflow (0.6.0-18584-g9ccaa8ec7)

Debug file from Sublime Merge

Metadata

Metadata

Assignees

No one assigned

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions