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 <f...@redhat.com> 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 <ncm...@ncultra.org> > > > Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com> > > > > 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
