From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: famz@redhat.com, qemu-devel@nongnu.org,
"Alex Bennée" <alex.bennee@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: [Qemu-devel] [PATCH for 2.10 v3 2/6] docker: fix dirty/stash detection on some systems
Date: Mon, 7 Aug 2017 16:39:30 +0100 [thread overview]
Message-ID: <20170807153934.29477-3-alex.bennee@linaro.org> (raw)
In-Reply-To: <20170807153934.29477-1-alex.bennee@linaro.org>
I reported this a while ago but evidently forgot to push the patch
upstream. Without this I wasn't seeing the dirty tree state submitted
to the docker build which is very confusing.
Reference:
Subject: [PATCH 1/6] tests/docker/Makefile.include: fix diff-index call
Date: Fri, 28 Oct 2016 17:33:34 +0100
Message-Id: <20161028163339.31096-2-alex.bennee@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
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 d7dafdbd27..ff580edfad 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 -- 2>/dev/null; then \
git archive -1 HEAD --format=tar.gz; \
else \
git archive -1 $$(git stash create) --format=tar.gz; \
--
2.13.0
next prev parent reply other threads:[~2017-08-07 15:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-07 15:39 [Qemu-devel] [PATCH for 2.10 v3 0/6] Various docker fixes Alex Bennée
2017-08-07 15:39 ` [Qemu-devel] [PATCH for 2.10 v3 1/6] docker: ensure NOUSER for travis images Alex Bennée
2017-08-08 1:38 ` Fam Zheng
2017-08-08 8:55 ` Alex Bennée
2017-08-07 15:39 ` Alex Bennée [this message]
2017-08-07 15:39 ` [Qemu-devel] [PATCH for 2.10 v3 3/6] docker: ignore submodules when checking diff Alex Bennée
2017-08-07 15:39 ` [Qemu-devel] [PATCH for 2.10 v3 4/6] docker: docker.py make --no-cache skip checksum test Alex Bennée
2017-08-08 1:43 ` Fam Zheng
2017-08-08 8:51 ` Alex Bennée
2017-08-08 12:39 ` Fam Zheng
2017-08-07 15:39 ` [Qemu-devel] [PATCH for 2.10 v3 5/6] docker: don't install device-tree-compiler build-deps in travis.docker Alex Bennée
2017-08-09 13:53 ` Philippe Mathieu-Daudé
2017-08-07 15:39 ` [Qemu-devel] [PATCH for 2.10 v3 6/6] docker: reduce noise when building travis.docker Alex Bennée
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=20170807153934.29477-3-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=peter.maydell@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).