For this patch, i think you forget to add qemu-version.h and/or qemu-version.h.tmp in .gitignore

changlox ~/w/qemu/qemu% gs
On branch master
Your branch is up-to-date with 'origin/master'.

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        qemu-version.h
        qemu-version.h.tmp

nothing added to commit but untracked files present (use "git add" to track)


On 06/01/2016 05:44 PM, Fam Zheng wrote:
v3: Use the "2.6.50 (v2.6.0-603-g684a494)" format. [Laszlo]
     printf '-dirty' -> printf -- '-dirty'.

v2: Address Eric's comments:
     "echo -n" -> "printf".
     "-unclean" -> "-dirty".

Makefile happened to be in my working set because of the docker test work, so I
went ahead to try this nice feature last evening before going to bed. My
apologies if we have duplicated work.

Please review, especially please comment on the redundant version string:

$ qemu-img --version
qemu-img version 2.6.50-v2.6.0-603-g684a494, Copyright (c) 2004-2008 Fabrice 
Bellard


Fam Zheng (2):
   Makefile: Add a "FORCE" target
   Makefile: Derive "PKGVERSION" from "git describe" by default

  Makefile              | 24 ++++++++++++++++++++++--
  linux-user/main.c     |  1 +
  qemu-img.c            |  1 +
  qmp.c                 |  1 +
  scripts/create_config |  4 ----
  vl.c                  |  1 +
  6 files changed, 26 insertions(+), 6 deletions(-)




Reply via email to