From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33432) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLTEP-0007UI-MH for qemu-devel@nongnu.org; Fri, 08 Jul 2016 06:42:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLTEL-0007dy-NX for qemu-devel@nongnu.org; Fri, 08 Jul 2016 06:42:01 -0400 Received: from mx2.suse.de ([195.135.220.15]:47726) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLTEL-0007dc-38 for qemu-devel@nongnu.org; Fri, 08 Jul 2016 06:41:57 -0400 References: <4ccbfe166a987fa7f3e71551f4d77456de189301.1467926074.git.jcody@redhat.com> From: =?UTF-8?Q?Andreas_F=c3=a4rber?= Message-ID: <577F8371.1090700@suse.de> Date: Fri, 8 Jul 2016 12:41:53 +0200 MIME-Version: 1.0 In-Reply-To: <4ccbfe166a987fa7f3e71551f4d77456de189301.1467926074.git.jcody@redhat.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 1/1] OpenBIOS: Switch over to official OpenBIOS git repo List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jeff Cody , qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk, agraf@suse.de, peter.maydell@linaro.org, stefanha@redhat.com Am 07.07.2016 um 23:22 schrieb Jeff Cody: > This update should preserve git history, and switches over to the offic= ial > 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). >=20 > The origin/master tag now follows the github hashes, so that means > users will need to update their local tracking branch: >=20 > 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=3Dorigin/master. >=20 > If you have local commits or branches to preserver, a rebase may be mor= e "preserve" > appropriate: >=20 > e.g. git rebase origin/master >=20 > N.B.: The server-side git changes have already happened, independent of= this > patch. >=20 > Proposed-by: Mark Cave-Ayland > Signed-off-by: Jeff Cody > --- > roms/openbios | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > 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 --=20 SUSE Linux GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Felix Imend=F6rffer, Jane Smithard, Graham Norton HRB 21284 (AG N=FCrnberg)