[TYPO3-v4] Working with submodules

Oliver Hader oliver.hader at typo3.org
Tue May 10 12:12:15 CEST 2011


Hi Stefano,

Am 09.05.11 19:24, schrieb Stefano Kowalke:
> Today git submodules was introduced in core for the external projects
> "version" and "workspaces".
> 
> 1)
> Unfortunable the revisions of where the submodules created from were not
> up-to-date. As result fixed issues popped up again. I noticed this on
> fixed CGL issues, so it is possible that all issues realted to verion
> and workspaces since mid of april are back again.

The CGL cleanup have been committed to the Core directly for
typo3/sysext/version and ~/workspaces. However I remember that I also
gave a positive vote on that change and did not realize that conflict.
For example this is something the submodule would solve - to take care
of the correct repository of external projects.

> 2)
> How works submodules in context of TYPO3 and gerrit? Where have I pushed
> things to?

One you have initialized the submodules (e.g. on master) by

# git pull
# git submodule update --init

you can just do your changes to typo3/sysext/version/<filename>, switch
to that directory and push it to the accordant repository

# cd typo3/sysext/version/
# git add <filename>
# git commit
# git push origin HEAD:refs/for/master/<issuenumber>

Then if you go back to the root of your local Git repository and do a diff

# git diff

you'll see something like this

index 10994a5..298a868 160000
--- a/typo3/sysext/version
+++ b/typo3/sysext/version
@@ -1 +1 @@
-Subproject commit 10994a5704cef2fc9094c68ab14109edd54b7b04
+Subproject commit 298a8688f2a6052469d68776ce28404a5493389e

Actually this is the submodule pointer that was changed to point to your
recent change in the submodule in typo3/sysext/version.

For TYPO3_4-5 ist basically the same, however the workspaces/version
branch there is called "4.5", thus it would be

# ....
# git push origin HEAD:refs/for/4.5/<issuenumber>

See the accordant projects:
http://git.typo3.org/TYPO3v4/CoreProjects/workspaces/version.git
http://git.typo3.org/TYPO3v4/CoreProjects/workspaces/workspaces.git

Cheers,
Olly
-- 
Oliver Hader
TYPO3 v4 Core Team Leader

TYPO3 .... inspiring people to share!
Get involved: http://typo3.org


More information about the TYPO3-project-v4 mailing list