From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47878) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkYpN-0002ZS-6w for qemu-devel@nongnu.org; Wed, 14 May 2014 09:02:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WkYpE-0008Dv-Qx for qemu-devel@nongnu.org; Wed, 14 May 2014 09:02:33 -0400 Received: from mail-wg0-x22a.google.com ([2a00:1450:400c:c00::22a]:33274) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WkYpE-0008Dj-Ku for qemu-devel@nongnu.org; Wed, 14 May 2014 09:02:24 -0400 Received: by mail-wg0-f42.google.com with SMTP id y10so1831447wgg.1 for ; Wed, 14 May 2014 06:02:23 -0700 (PDT) Date: Wed, 14 May 2014 15:02:20 +0200 From: Stefan Hajnoczi Message-ID: <20140514130220.GH16683@stefanha-thinkpad.redhat.com> References: <1399997268-9889-1-git-send-email-ncmike@ncultra.org> <20140514075046.GC3610@noname.redhat.com> <20140514080914.GG1856@T430.nay.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140514080914.GG1856@T430.nay.redhat.com> Subject: Re: [Qemu-devel] [PATCH] qemu-img: sort block formats in help message List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: Kevin Wolf , peter.maydell@linaro.org, qemu-devel@nongnu.org, Mike Day , stefanha@redhat.com, cornelia.huck@de.ibm.com On Wed, May 14, 2014 at 04:09:14PM +0800, Fam Zheng wrote: > On Wed, 05/14 09:50, Kevin Wolf wrote: > > Am 13.05.2014 um 18:07 hat Mike Day geschrieben: > > > The help message for qemu-img lists the supported block formats, of > > > which there are 27 as of version 2.0.50. The formats are printed in > > > the order of their driver's position in a linked list, which appears > > > random. This patch prints the formats in sorted order, making it > > > easier to read and to find a specific format in the list. > > > > > > [Added suggestions from Fam Zheng to declare variables > > > at the top of the scope in help() and to omit explicit cast for void* > > > opaque. > > > --Stefan] > > > > > > [Removed call to g_sequence_lookup because it breaks the build on > > > machines with glib < 2.28. > > > --Mike] > > > > > > Signed-off-by: Mike Day > > > Signed-off-by: Stefan Hajnoczi > > > > What happened here? This patch seems to be already applied, and you > > included Stefan's SoB as well. > > > > Mike, please fix on top of current master, instead of squashing the removing of > g_sequence_lookup into your already merged patch. Yes, we cannot change the git commit history once a commit is in the public qemu.git repository. The only options are to: 1. Add a patch on top that fixes the issue. 2. Use git-revert(1) to undo your commit entirely (this adds a new patch on top the applies the reverse diff). In this case #1 seems like a good choice. Stefan