[TYPO3-core] Incubator troubles

[Jigal van Hemert]

Hi,

On 1-12-2011 10:59, Peter Niederlag wrote:
> until here this looks "perfect"...
>> =======PULL==========
>>
>> After that I tried a pull (just like I do for the normal Core) and
>> this seems to be the cause for the 322 or so commits.
>
> Can you post the exact command you use?

git.exe pull -v --progress     "origin" master

 From git://git.typo3.org/TYPO3v4/Incubator
* branch            master     -> FETCH_HEAD
First, rewinding head to replay your work on top of it...
Applying: [FEATURE] Initialize graphics handlers
Success

The Pulled log showed indeed 323 revision(s), from revision 994b01 to 
revision 97d228 .

> I still guess for some weird reasons (git config, ???) you are
> pulling/merging in changes from another branch or even repository...
>
> Do you have any symlinks, hardlinks?

No, no symlinks/hardlinks inside any repository (only a link to the 
normal core repository from my XAMPP typo3_src 'directory', but that is 
completely outside this Incubator stuff)

Commands performed inside the Incubator directory...

> git config --list --global

$ git config --list --global
user.name=Jigal van Hemert
user.email=jigal at xs4all.nl
url.ssh://jigal@review.typo3.org:29418.pushinsteadof=git://git.typo3.org
branch.autosetuprebase=remote
gui.recentrepo=D:/TYPO3/TYPO3 Core Git


> git config --list

$ git config --list
core.symlinks=false
core.autocrlf=true
color.diff=auto
color.status=auto
color.branch=auto
color.interactive=true
pack.packsizelimit=2g
help.format=html
http.sslcainfo=/bin/curl-ca-bundle.crt
sendemail.smtpserver=/bin/msmtp.exe
diff.astextplain.textconv=astextplain
user.name=Jigal van Hemert
user.email=jigal at xs4all.nl
url.ssh://jigal@review.typo3.org:29418.pushinsteadof=git://git.typo3.org
branch.autosetuprebase=remote
gui.recentrepo=D:/TYPO3/TYPO3 Core Git
core.repositoryformatversion=0
core.filemode=false
core.bare=false
core.logallrefupdates=true
core.symlinks=false
core.ignorecase=true
core.hidedotfiles=dotGitOnly
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
remote.origin.url=git://git.typo3.org/TYPO3v4/Incubator.git
remote.origin.puttykeyfile=
branch.master.remote=origin
branch.master.merge=refs/heads/master
branch.master.rebase=true
branch.project-graphicslibrary.remote=origin
branch.project-graphicslibrary.merge=refs/heads/project-graphicslibrary
branch.project-graphicslibrary.rebase=true
submodule.typo3/sysext/dbal.url=git://git.typo3.org/TYPO3v4/Extensions/dbal.git
submodule.typo3/sysext/extbase.url=git://git.typo3.org/TYPO3v4/CoreProjects/MVC/extbase.git
submodule.typo3/sysext/fluid.url=git://git.typo3.org/TYPO3v4/CoreProjects/MVC/fluid.git
submodule.typo3/sysext/version.url=git://git.typo3.org/TYPO3v4/CoreProjects/workspaces/version.git
submodule.typo3/sysext/workspaces.url=git://git.typo3.org/TYPO3v4/CoreProjects/workspaces/workspaces.git

This is the general configuration I once set (in Berlin I guess). 
Nowhere in the Incubator info on forge was info that something should be 
changed.

-- 
Kind regards / met vriendelijke groet,

Jigal van Hemert.