From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:52551)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <xiecl.fnst@cn.fujitsu.com>) id 1bEr6a-0002xs-DW
	for qemu-devel@nongnu.org; Mon, 20 Jun 2016 00:46:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <xiecl.fnst@cn.fujitsu.com>) id 1bEr6Y-0004iL-DU
	for qemu-devel@nongnu.org; Mon, 20 Jun 2016 00:46:35 -0400
Message-ID: <57677620.5090403@cn.fujitsu.com>
Date: Mon, 20 Jun 2016 12:50:40 +0800
From: Changlong Xie <xiecl.fnst@cn.fujitsu.com>
MIME-Version: 1.0
References: <1464774261-648-1-git-send-email-famz@redhat.com>
In-Reply-To: <1464774261-648-1-git-send-email-famz@redhat.com>
Content-Type: text/plain; charset="utf-8"; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v3 0/2] Let PKGVERSION include the "git
 describe" output
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Fam Zheng <famz@redhat.com>, qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, qemu-block@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>, lersek@redhat.com

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(-)
>