From patchwork Thu Jul 20 13:47:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 108345 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp2152246obm; Thu, 20 Jul 2017 06:49:22 -0700 (PDT) X-Received: by 10.200.8.186 with SMTP id v55mr4740040qth.261.1500558562373; Thu, 20 Jul 2017 06:49:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500558562; cv=none; d=google.com; s=arc-20160816; b=rFRFmj0orPYmKHQToZtkp5aBsjXc22od6vLOECMZ26eApznmGlLIebDeoe2iyCTdtB ns3XGb244FTj5qoJ+NcuImpZ/JT6/bNsYE4WH7i34S4upVhoJU7Yluab1ANOnZptWFtG 429LFc81l8k+TxtPKJXwY/21P23f304Dawl7JGs7yDt63VOu68tpSO1djH0xl0Aoke1c WgZVXR8CyTKnw0oqsyLBLtio2vWn2j5Bl+szLqkTZmDmEf3biyVMGKvYaMEMEnHUll4f Pp54brhPIOqULszm0qts3JX0Zvvw22Ti/eDSQpfmNTzznaFO+Mh8h+YhnmVgyVJsx4Vi 86yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=KJllUUY7/JML5fthUBtJulKUKDRZoaZgVeUOqZWRic0=; b=HoyadSCfRAkzJXP53Nix2Rh5omYJWjEnhY6Paf4ssxkhAg3+Rx3Rau9P0DM1hCJ59l jOo3l0opqcpL9a9+AcLFgdnGSM/SKoU+6kEnbdbDueQ6C6hA0eM7TsUOXJKVlQip6iFm 1GSEPfjwGQoHK9vByhUbJiqRd93dQ7NPLGqB4hKZO1apEhXRePDMurs3BpacHARTDyG4 312ZuShjRMRW8iZf2z5GhSfJHhajiPMafVwhrrGXGBRqzTz2bmj1VjOzdKQIeKFKqSjk dt9cXxv/75/6H9GjwCDXMqx72aWrlXD1f0+4t5bTud6Df3b/X3KIHr1ViHv+b88nv/7g 8P2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=aZP6GDxM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h36si1957249qtc.547.2017.07.20.06.49.21 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 20 Jul 2017 06:49:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.b=aZP6GDxM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38188 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYBpP-0004tH-Nx for patch@linaro.org; Thu, 20 Jul 2017 09:49:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33522) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYBnY-0003sy-Te for qemu-devel@nongnu.org; Thu, 20 Jul 2017 09:47:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dYBnX-00089U-PT for qemu-devel@nongnu.org; Thu, 20 Jul 2017 09:47:24 -0400 Received: from mail-wr0-x22f.google.com ([2a00:1450:400c:c0c::22f]:38019) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dYBnX-00089B-J3 for qemu-devel@nongnu.org; Thu, 20 Jul 2017 09:47:23 -0400 Received: by mail-wr0-x22f.google.com with SMTP id f21so14587612wrf.5 for ; Thu, 20 Jul 2017 06:47:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KJllUUY7/JML5fthUBtJulKUKDRZoaZgVeUOqZWRic0=; b=aZP6GDxMnNW9MC+xOjOU6qojbBQaNR7dzkILncFWSAu2HjTZQOi08uAAjyANUtWxKm HhWXid96XfN0R+3aHs98ueSQBiyKHqS3czsl09pfpr2z1FkoKNe3T4wWIqlAqYN262fg UPg3I7OWgaCtdlAFhB/QlaUrnaKfz2zGP1yVY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KJllUUY7/JML5fthUBtJulKUKDRZoaZgVeUOqZWRic0=; b=Bld8VBXcCHdOMZRLVME04VELNwUwFd2Vtdv0tAayFM44kND5eKFaFzsiKsSQ5vr5Nh 4bZE/IIwNYVQIoUziuo5UKaL7vPe4EneCFKamHnMpJ+DYQxIxWJniT5nJrNPBpAGe9gt OIXQpuAypcczxKSyOGCdDAiO0kPYPkOFc6csvuq4Abp+vgSsv8KFu+ztks/5kfsvgRX3 y61BheLE186JlweIhZhDOAMa5KKWP+0AX7BLKCexGS3eY1WN7zaeZ0VG8sjebhUEQjrx bqZdUvQQkz6GfsvoZSdi2zstWRKDEoeJ1KdnPMHHMnEKzI0ik2JmqyFBjvim7GiZ8yh+ 4Hbw== X-Gm-Message-State: AIVw113qjSc680qez1oacZGkDlk+u/DIDAFrtFHR6jO00BUo8cqPqQ2H 6XJC7KFFIhr6UOpb X-Received: by 10.223.163.85 with SMTP id d21mr6811074wrb.33.1500558442439; Thu, 20 Jul 2017 06:47:22 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y35sm7042900wrc.51.2017.07.20.06.47.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jul 2017 06:47:18 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 1E77E3E0AE9; Thu, 20 Jul 2017 14:47:17 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Thu, 20 Jul 2017 14:47:16 +0100 Message-Id: <20170720134716.13049-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170720134716.13049-1-alex.bennee@linaro.org> References: <20170720134716.13049-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22f Subject: [Qemu-devel] [RFC PATCH for 2.10 3/3] docker: ignore submodules when checking diff X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , famz@redhat.com, qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.13.0 Reviewed-by: Eric Blake 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; \