From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37532)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1c12By-0007ZP-ET
	for qemu-devel@nongnu.org; Sun, 30 Oct 2016 22:19:19 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <famz@redhat.com>) id 1c12Bv-0000mc-B9
	for qemu-devel@nongnu.org; Sun, 30 Oct 2016 22:19:18 -0400
Received: from mx1.redhat.com ([209.132.183.28]:35468)
	by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.71) (envelope-from <famz@redhat.com>) id 1c12Bv-0000lB-5L
	for qemu-devel@nongnu.org; Sun, 30 Oct 2016 22:19:15 -0400
Date: Mon, 31 Oct 2016 10:19:11 +0800
From: Fam Zheng <famz@redhat.com>
Message-ID: <20161031021911.GE30303@lemon>
References: <20161028163339.31096-1-alex.bennee@linaro.org>
	<20161028163339.31096-2-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
In-Reply-To: <20161028163339.31096-2-alex.bennee@linaro.org>
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH 1/6] tests/docker/Makefile.include: fix
 diff-index call
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: Alex =?iso-8859-1?Q?Benn=E9e?= <alex.bennee@linaro.org>
Cc: qemu-devel@nongnu.org

On Fri, 10/28 17:33, Alex Benn=E9e wrote:
> The whole thing is wrapped inside a call quiet-command as well as being
> the actual call taking a --quiet argument so the redirect is
> superfluous. For reasons I have yet to determine this also seems to be
> causing the source preparation step to skip stashing work tree stuff.
>=20
> Signed-off-by: Alex Benn=E9e <alex.bennee@linaro.org>
>=20
> ---
> TODO:
>   - properly understand the failure

Yep, I don't see the bug on my machine (Fedora 24, git 2.7.4). What about=
 the
removed "--"? Does that make a difference for you?

> ---
>  tests/docker/Makefile.include | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.incl=
ude
> index 3f15d5a..d91e28b 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -20,7 +20,7 @@ IMAGES ?=3D %
>  # Make archive from git repo $1 to tar.gz $2
>  make-archive-maybe =3D $(if $(wildcard $1/*), \
>  	$(call quiet-command, \
> -		(cd $1; if git diff-index --quiet HEAD -- &>/dev/null; then \
> +		(cd $1; if git diff-index --quiet HEAD; then \
>  			git archive -1 HEAD --format=3Dtar.gz; \
>  		else \
>  			git archive -1 $$(git stash create) --format=3Dtar.gz; \
> --=20
> 2.10.1
>=20
>=20