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

[Andreas Färber]

Am 07.07.2016 um 23:22 schrieb Jeff Cody:
> This update should preserve git history, and switches 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).
> 
> The origin/master tag now follows the github hashes, so that means
> users will need to update their local tracking branch:
> 
> e.g.: git reset --hard origin/master

Does that actually update the tracked branch? I would've assumed you
additionally need git branch --set-upstream-to=origin/master.

> 
> If you have local commits or branches to preserver, a rebase may be more

"preserve"

> appropriate:
> 
> e.g. git rebase origin/master
> 
> N.B.: The server-side git changes have already happened, independent of this
>       patch.
> 
> Proposed-by: Mark Cave-Ayland <address@hidden>
> Signed-off-by: Jeff Cody <address@hidden>
> ---
>  roms/openbios | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/roms/openbios b/roms/openbios
> index 422b916..36785d7 160000
> --- a/roms/openbios
> +++ b/roms/openbios
> @@ -1 +1 @@
> -Subproject commit 422b916649aa0db8c5edadccb22387b3e807e3b2
> +Subproject commit 36785d7b59726beca320a0b99cfa0a903782c6f3

Otherwise looks good, thanks.

Peter, will you be picking this up?

Regards,
Andreas

-- 
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer, Jane Smithard, Graham Norton
HRB 21284 (AG Nürnberg)