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

[Jeff Cody]

On Mon, Jul 11, 2016 at 08:46:56PM +0100, Mark Cave-Ayland wrote:
> On 08/07/16 17:02, Mark Cave-Ayland wrote:
> 
> > On 08/07/16 11:41, Andreas Färber wrote:
> > 
> >> 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).
> > 
> > Maybe rather than "switches over to the official openbios git repo,
> > rather than pulling from the svn mirror" it should be "switches over to
> > a mirror of the new official git repo hosted at
> > https://github.com/openbios from a git-svn import of the old coreboot
> > SVN repository"?
> > 
> >>> 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.
> > 
> > Good point - that probably wouldn't change the upstream. I'd actually be
> > perfectly happy with the first paragraph on its own with a few minor
> > alterations rather than go into too much detail on the rebase process (I
> > can handle this on a per-case basis over on the OpenBIOS list).
> > 
> >>> 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.
> > 
> > Agreed :)
> > 
> >> Peter, will you be picking this up?
> > 
> > Or I can send a pull request for a v2 patch with a SoB? Just let me know.
> 
> Hi Jeff,
> 
> I've just noticed that the commits I pushed to the OpenBIOS github
> repository over the weekend haven't been pulled into the
> git.qemu-project.org repository yet - any chance you could take a look
> at the nightly update script?
>

Hi Mark,

Thanks - I just looked, and I needed to add a merge --ff-only to the
update script.  It should be fixed now, let me know if you see any
oddities still.


> And also do you want me to reword and send the pull request above?
>

Yes, that would be great - I'm on vacation this week, so I have
limited connectivity.

Thanks,
Jeff