[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 1/6] tests/docker/Makefile.include: fix diff-ind
From: |
Fam Zheng |
Subject: |
Re: [Qemu-devel] [PATCH 1/6] tests/docker/Makefile.include: fix diff-index call |
Date: |
Mon, 31 Oct 2016 10:19:11 +0800 |
User-agent: |
Mutt/1.7.1 (2016-10-04) |
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 <address@hidden>
>
> ---
> 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
>
>
- [Qemu-devel] [PATCH 0/6] Expand the building of qemu-user docker images, Alex Bennée, 2016/10/28
- [Qemu-devel] [PATCH 1/6] tests/docker/Makefile.include: fix diff-index call, Alex Bennée, 2016/10/28
- Re: [Qemu-devel] [PATCH 1/6] tests/docker/Makefile.include: fix diff-index call,
Fam Zheng <=
- [Qemu-devel] [PATCH 6/6] tests/docker/Makefile.include: expand docker help text, Alex Bennée, 2016/10/28
- [Qemu-devel] [PATCH 4/6] tests/docker/Makefile: Add a rule for Debian user images, Alex Bennée, 2016/10/28
- [Qemu-devel] [PATCH 5/6] tests/docker/docker.py: expand images command, Alex Bennée, 2016/10/28
- [Qemu-devel] [PATCH 3/6] tests/docker: add optional libs to travis.docker, Alex Bennée, 2016/10/28
- [Qemu-devel] [PATCH 2/6] tests/docker/test-user: a simple linux-user test, Alex Bennée, 2016/10/28