Re: [Qemu-devel] [RFC PATCH 1/1] OpenBIOS: Switch over to official OpenBIOS git repo

[Mark Cave-Ayland]

On 21/06/16 14:48, Mark Cave-Ayland wrote:

> On 21/06/16 11:28, Stefan Hajnoczi wrote:
> 
>> On Tue, Jun 21, 2016 at 01:40:42AM -0400, Jeff Cody wrote:
>>> This update should preserve git history, and allow seamless switching
>>> over to the official openbios git repo, rather than pulling from the
>>> svn mirror.  All prior history from the svn repository should still be
>>> preserved (i.e., commit hashes are the same for historical commits).
>>>
>>> In the roms/openbios submodule, the branch "origin/official" is the
>>> latest mirror of the official git repository (fetched daily).
>>>
>>> Signed-off-by: Jeff Cody <address@hidden>
>>> ---
>>>  roms/openbios | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> Assuming the git.qemu-project.org openbios.git remote and .git/config
>> mirror setting has been updated to use the new upstream git repo:
>>
>> Reviewed-by: Stefan Hajnoczi <address@hidden>
> 
> Is it possible to switch this around, so that there is a legacy branch
> which points to the current HEAD and master points to the new, upstream
> git HEAD? Then it means if someone clones either the
> git.qemu-project.org repository or the official repository then the
> default master branch will point to the same HEAD.

Urgent ping? It has been another week, we're coming up to soft freeze
and the PPC guys are urgently after an OpenBIOS fix.

As per the above I'd really like the branches switched around so that
both the git.qemu-project.org master and github.com master are exactly
the same HEAD although I believe it may be technically possible to do
this part separately once the HEAD switch is in? If so, please can we
apply this and then I can line up and attempt to push the outstanding
patches to the new github master later this evening.


ATB,

Mark.