Xcode Git Submodule Commit Issue

Question

What I did

• I made a new Single Page App project in my application called "parent".
• I made a new Static library project called "child" and I've Added it as a git submodule in my parent project folder.
• I have imported the child project into the parent project by dragging from the finder from submodule directory, the child project file to my parent project in Xcode window -> Parent Project file tree.

Now Is my problem

• When I would like to do a commit through File -> Source Control -> Commit, I select files enter my message and do a commit all goes right.

• Now When I make a change into my child project and try to commit by the same way, xcode make me know it success the commit

• Now try a pull from File -> Source Control -> Pull, My child project is selectable but my parent project has "Uncommited Changes".

• So I come back to the commit interface and I saw the items that should have been committed during the last commit. Especially the folder of my submodule project.

What I did to resolve the problem

I use git from the command line in my parent project folder: git add . git commit -am "Core has been modified"

When I use this, I can access my to repository from the pull interface, that confirm that all change has been committed.

The real Problem

My company would like to make that work only with the Xcode SCM tool. The problem seems to be linked to the use of "Submodule" How can I make it work without the use of the Command Line

Answer 1

We have the same problem. It's like a small bug in XCode. Our workaround at the moment is the same as you mentioned and the only solution would be a bugfix or enhancement how XCode support

Our workflow looks like the following :

-commit submodule changes with XCode -commit main changes with XCode -commit main directory change with CLI ( git commit ) -push main & submodule with XCode

we hope that this small bug would be fixed in the future directly in XCode

Answer 2

When you make a commit in a submodule, it shows up as a change in the parent.

The solution is to make changes to the submodule first, then commit the changes to the parent. This way all of your changes to the submodule will get bundled into the parent project commit.