[TYPO3-dev] gray hair with git ...

[Kay Strobach]

Hi,

is it normal that all submodules get lost on a new checkout?
Thanks in advice
Kay

Am 22.06.2011 15:06, schrieb Kay Strobach:
> Yeah;
> 
> http://git.661346.n2.nabble.com/PATCH-submodule-Add-force-option-for-git-submodule-update-td6222230.html
> 
> git submodule foreach --recursive git checkout -f
> 
> -> do the following for every submodule on windows:
> 
> git checkout -f
> 
> Fixed it...
> 
> Sry for the monologue, but it drives me nuts, that git is sometimes hard
> to controll ;)
> 
> Regards
> Kay
> Am 22.06.2011 14:10, schrieb Kay Strobach:
>> Hello Jigal,
>>
>> i dropped my local branch now to push my first change to gerrit.
>>
>> https://review.typo3.org/#change,2869
>>
>> That worked finally.
>> But there still the submodules missing in some local branches ...
>>
>>
>> Checkout the issue (change from master):
>>
>>> kay at KAYLAPTOP /d/devenv/mowesII/www/t3-trunk (master)
>>> $ git checkout issue_27432
>>> M       typo3/sysext/dbal
>>> M       typo3/sysext/extbase
>>> M       typo3/sysext/fluid
>>> M       typo3/sysext/version
>>> M       typo3/sysext/workspaces
>>> Switched to branch 'issue_27432'
>>> Your branch is ahead of 'origin/master' by 1 commit.
>>
>>
>>> $ git submodule status
>>>  54836ed6e0f8c376b07106117f46af381b6d8306 typo3/sysext/dbal (TYPO3_4-6-0alpha2)
>>>  342b74873ff0d2e7400dc351d3f672595efb82f2 typo3/sysext/extbase (TYPO3_4-6-0alpha2)
>>>  27b0ef5623ae322a17646e8e69527c28a80ad09c typo3/sysext/fluid (TYPO3_4-6-0alpha2)
>>>  511420633f303cfe4b657d078daea4b8f730de74 typo3/sysext/version (TYPO3_4-6-0alpha2)
>>>  dfe00e853eb33ea957a159aa26e162e268151562 typo3/sysext/workspaces (TYPO3_4-6-0alpha2)
>>
>> i called submodule update --init several times now ... i takes some
>> time, but the sysext submodules stay empty.
>>
>> If i checkout the master everything is fine ...
>>
>> Regards
>> Kay
>>
>>
>> Am 22.06.2011 12:11, schrieb Kay Strobach:
>>> Hello Jigal,
>>>
>>> thanks.
>>> Added the following to the wiki:
>>>
>>> git submodule init
>>> Integrate the files (fill the directories) of the submodules with
>>> shell script:
>>> git submodule update
>>>
>>> http://wiki.typo3.org/Contribution_Walkthrough_with_CommandLine#Improving_the_patch_and_uploading_a_new_Patch_Set
>>>
>>> Hope you/we win ;)
>>>
>>> Regards
>>> Kay
>>>
>>> Am 22.06.2011 12:07, schrieb Jigal van Hemert:
>>>> Hi,
>>>>
>>>> On 22-6-2011 11:59, Kay Strobach wrote:
>>>>> Is there any easy way to load these directories (that are git submodules
>>>>> as far as i know) during the creation of a patch?
>>>>>
>>>>> git checkout master
>>>>>
>>>>
>>>> git submodule update --init
>>>>
>>>> maybe? (Yes, I have git-fights almost every day; guess who usually wins)
>>>>
>>>
>>>
>>
>>
> 
> 


-- 
http://www.kay-strobach.de - Open Source Rocks

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