From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:50092)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1c1VuA-0001hl-HT
	for qemu-devel@nongnu.org; Tue, 01 Nov 2016 06:02:55 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <alex.bennee@linaro.org>) id 1c1Vu7-0001U9-FS
	for qemu-devel@nongnu.org; Tue, 01 Nov 2016 06:02:54 -0400
Received: from mail-wm0-x230.google.com ([2a00:1450:400c:c09::230]:34182)
	by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
	(Exim 4.71) (envelope-from <alex.bennee@linaro.org>)
	id 1c1Vu7-0001TQ-0k
	for qemu-devel@nongnu.org; Tue, 01 Nov 2016 06:02:51 -0400
Received: by mail-wm0-x230.google.com with SMTP id u144so14016592wmu.1
	for <qemu-devel@nongnu.org>; Tue, 01 Nov 2016 03:02:50 -0700 (PDT)
References: <20161028163339.31096-1-alex.bennee@linaro.org>
	<20161028163339.31096-2-alex.bennee@linaro.org>
	<20161031021911.GE30303@lemon>
From: Alex =?utf-8?Q?Benn=C3=A9e?= <alex.bennee@linaro.org>
In-reply-to: <20161031021911.GE30303@lemon>
Date: Tue, 01 Nov 2016 10:02:47 +0000
Message-ID: <8760o7y0u0.fsf@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
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: Fam Zheng <famz@redhat.com>
Cc: qemu-devel@nongnu.org


Fam Zheng <famz@redhat.com> writes:

> On Fri, 10/28 17:33, Alex Bennée 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.
>>
>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
>>
>> ---
>> 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?

Nope - it seems to be the &>/dev/null that triggers the problem - but
only in the Makefile. Running the commands from the command line works
as expected.

However why do we need the redirect here anyway considering the call
quiet-command?

>
>> ---
>>  tests/docker/Makefile.include | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
>> index 3f15d5a..d91e28b 100644
>> --- a/tests/docker/Makefile.include
>> +++ b/tests/docker/Makefile.include
>> @@ -20,7 +20,7 @@ IMAGES ?= %
>>  # Make archive from git repo $1 to tar.gz $2
>>  make-archive-maybe = $(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=tar.gz; \
>>  		else \
>>  			git archive -1 $$(git stash create) --format=tar.gz; \
>> --
>> 2.10.1
>>
>>


--
Alex Bennée