Review Request 109503: Compile with current qt dev branch

Stephen Kelly steveire at gmail.com
Sat Mar 16 11:23:25 UTC 2013


Stephen Kelly wrote:

> Ben Cooksley wrote:
>> In theory, however Jenkins itself does Git handling for part of the
>> process and that may very well override our invocation of that.
>> 
>> In any case, git spits out the following if I run that for each
>> submodule:
>> 
>> You are not currently on a branch, so I cannot use any
>> 'branch.<branchname>.merge' in your configuration file.
>> Please specify which branch you want to merge with on the command
>> line and try again (e.g. 'git pull <repository> <refspec>').
>> See git-pull(1) for details.
>> 
>> So we would need something more advanced than that.
>> 
> 
> Try
> 
>  git submodule foreach 'git fetch; git reset --hard origin/dev

I mean 

  git submodule foreach 'git fetch; git reset --hard origin/dev || true'

sorry.




More information about the Kde-frameworks-devel mailing list