Submodules in detached HEAD state show up as unstaged changes about sublime_merge HOT 4 CLOSED

Thanks for the report. This should be fixed now in dev build 1066 at https://www.sublimemerge.com/dev - please let me know if it's not

from sublime_merge.

I am also seeing this "Deleted", <contents empty> issue in build 1065 on macOS, even for a submodule with no changes and no detached HEAD involved. There are also several reports on the forums here.

from sublime_merge.

Thanks, @jskinner - the first case I mentioned seems to be fixed - which is awesome, so thank you. The second however seems to still be present. This is where I have submodules in a detached HEAD state, AND there's local changes that have been made to them, which are not showing up in Sublime Merge, but do show up when I run $ git status. This could be completely unrelated, but I'm not sure. If necessary I can submit a separate issue for this - just let me know.

There's untracked content in a submodule that is also in a detached HEAD state

The corresponding view in Sublime Merge

from sublime_merge.

Thanks for the confirmation @Zooce!

Sublime Merge not showing changes within a submodule is indeed a separate issue. We don't currently recurse into the submodule to determine if there are any local changes, we only look at the current HEAD of the submodule and compare it vs the index.

It's more of a UI thing than anything else: showing that the submodule has modified or untracked files in the 'Commit Changes' dialog does have the advantage of doing the same thing that git status does, but it also has downsides: there's no way to resolve those items from within the commit changes area, so they'd have to appear as status items without any buttons, which is fine, but does require some planning.

We'll be going over our submodule UI in the near future, and I hope to get this addressed then.

In any case, feel free to open a 2nd issue for the above, it wouldn't hurt to track it explicitly.

from sublime_merge.