[TYPO3-dev] Troubles with submodules in Git

[Dmitry Dulepov]

Hi!

Every time when when I try to improve an existing patch, I get troubles with submodules. Log:

Applico:~/Projects/TYPO3/TYPO3-master$ git co -b issue_22881 origin/master
Branch issue_22881 set up to track remote branch master from origin by rebasing.
Switched to a new branch 'issue_22881'

Applico:~/Projects/TYPO3/TYPO3-master$ git st
# On branch issue_22881
nothing to commit (working directory clean)

Applico:~/Projects/TYPO3/TYPO3-master$ git fetch ssh://dmitry@review.typo3.org:29418/TYPO3v4/Core refs/changes/78/1778/2 && git cherry-pick FETCH_HEAD
 From ssh://review.typo3.org:29418/TYPO3v4/Core
  * branch            refs/changes/78/1778/2 -> FETCH_HEAD
error: could not apply accf4bb... [BUGFIX] Removed dependency on TYPO3_MODE in saltedpasswords
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

Applico:~/Projects/TYPO3/TYPO3-master$ git st
# On branch issue_22881
# Changes to be committed:
#
#	modified:   typo3/sysext/saltedpasswords/sv1/class.tx_saltedpasswords_sv1.php
#
# Unmerged paths:
#   (use "git add/rm <file>..." as appropriate to mark resolution)
#
#	added by us:        typo3/sysext/dbal
#	added by us:        typo3/sysext/extbase
#	added by us:        typo3/sysext/fluid
#	added by us:        typo3/sysext/version
#	added by us:        typo3/sysext/workspaces
#

Now I have a broken branch due to submodules :( Normally I can fix it by going to each submodule, making git reset --hard and than git submodule --init from the base directory. But this time it is broken completely and I cannot fix it.

Does anybody have a 100% working way with those submodules? Please, share, I am getting desperate.

-- 
Dmitry "itoldyou" Dulepov
TYPO3 core&security team member
E-mail: dmitry.dulepov at typo3.org
Web: http://dmitry-dulepov.com/