[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for 2.10 v2 3/6] docker: ignore submodules when chec
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH for 2.10 v2 3/6] docker: ignore submodules when checking diff |
Date: |
Tue, 25 Jul 2017 14:34:22 +0100 |
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.
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
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 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; \
--
2.13.0
- [Qemu-devel] [PATCH for 2.10 v2 0/6] Various docker fixes, Alex Bennée, 2017/07/25
- [Qemu-devel] [PATCH for 2.10 v2 1/6] docker: ensure NOUSER for travis images, Alex Bennée, 2017/07/25
- [Qemu-devel] [PATCH for 2.10 v2 4/6] docker: docker.py make --no-cache skip checksum test, Alex Bennée, 2017/07/25
- [Qemu-devel] [PATCH for 2.10 v2 2/6] docker: fix dirty/stash detection on some systems, Alex Bennée, 2017/07/25
- [Qemu-devel] [PATCH for 2.10 v2 3/6] docker: ignore submodules when checking diff,
Alex Bennée <=
- [Qemu-devel] [PATCH for 2.10 v2 6/6] docker: reduce noise when building travis.docker, Alex Bennée, 2017/07/25
- [Qemu-devel] [PATCH for 2.10 v2 5/6] docker: don't install device-tree-compiler build-deps in travis.docker, Alex Bennée, 2017/07/25