From: Fam Zheng <famz@redhat.com>
To: "Alex Bennée" <alex.bennee@linaro.org>
Cc: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 1/6] tests/docker/Makefile.include: fix diff-index call
Date: Mon, 31 Oct 2016 10:19:11 +0800 [thread overview]
Message-ID: <20161031021911.GE30303@lemon> (raw)
In-Reply-To: <20161028163339.31096-2-alex.bennee@linaro.org>
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?
> ---
> 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
>
>
next prev parent reply other threads:[~2016-10-31 2:19 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-28 16:33 [Qemu-devel] [PATCH 0/6] Expand the building of qemu-user docker images Alex Bennée
2016-10-28 16:33 ` [Qemu-devel] [PATCH 1/6] tests/docker/Makefile.include: fix diff-index call Alex Bennée
2016-10-31 2:19 ` Fam Zheng [this message]
2016-10-31 11:55 ` Alex Bennée
2016-11-01 10:02 ` Alex Bennée
2016-11-01 10:38 ` Fam Zheng
2016-11-01 11:41 ` Alex Bennée
2016-10-28 16:33 ` [Qemu-devel] [PATCH 2/6] tests/docker/test-user: a simple linux-user test Alex Bennée
2016-10-31 2:20 ` Fam Zheng
2016-10-28 16:33 ` [Qemu-devel] [PATCH 3/6] tests/docker: add optional libs to travis.docker Alex Bennée
2016-10-31 2:23 ` Fam Zheng
2016-10-28 16:33 ` [Qemu-devel] [PATCH 4/6] tests/docker/Makefile: Add a rule for Debian user images Alex Bennée
2016-10-28 16:33 ` [Qemu-devel] [PATCH 5/6] tests/docker/docker.py: expand images command Alex Bennée
2016-10-31 2:28 ` Fam Zheng
2016-10-28 16:33 ` [Qemu-devel] [PATCH 6/6] tests/docker/Makefile.include: expand docker help text Alex Bennée
2016-10-31 2:34 ` Fam Zheng
2016-10-31 2:41 ` [Qemu-devel] [PATCH 0/6] Expand the building of qemu-user docker images Fam Zheng
2016-10-31 11:40 ` Alex Bennée
2016-10-31 13:39 ` Fam Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161031021911.GE30303@lemon \
--to=famz@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).