[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [RFC PATCH for 2.10 3/3] docker: ignore submodules when
From: |
Eric Blake |
Subject: |
Re: [Qemu-devel] [RFC PATCH for 2.10 3/3] docker: ignore submodules when checking diff |
Date: |
Thu, 20 Jul 2017 08:57:51 -0500 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 |
On 07/20/2017 08:47 AM, Alex Bennée wrote:
> The QEMU tree often has dirty submodules in it but this will confuse
> things as git stash is not going to save their state directly. They
> are likely just dirty from build files anyway. Ignore them in the
> diff-index command.
It's annoying that our build dirties a submodule in the first place; it
would be nice to get rid of those bugs in our build process (ideally,
the build should treat submodule directories as read-only). But that is
a bigger effort, so I'm okay with your hack in the meantime.
>
> Signed-off-by: Alex Bennée <address@hidden>
> ---
> tests/docker/Makefile.include | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Eric Blake <address@hidden>
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index ff580edfad..2a560a5327 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 -- 2>/dev/null; then \
> + (cd $1; if git diff-index --quiet --ignore-submodules HEAD --
> 2>/dev/null; then \
> git archive -1 HEAD --format=tar.gz; \
> else \
> git archive -1 $$(git stash create) --format=tar.gz; \
>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature