From patchwork Mon Aug 7 15:39:31 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: 109570 Delivered-To: patch@linaro.org Received: by 10.182.109.195 with SMTP id hu3csp2908481obb; Mon, 7 Aug 2017 08:46:49 -0700 (PDT) X-Received: by 10.200.36.54 with SMTP id c51mr1494621qtc.25.1502120809594; Mon, 07 Aug 2017 08:46:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1502120809; cv=none; d=google.com; s=arc-20160816; b=WYVg2Lqh/HzgDiepHdXWEdapUMvh/8bSDhpWKLgYj7urGU0G8hqaFk5TSDnOJQLY3f i/qAV8KE27oJRPgvmwW7GS7NlNi1U0IVAayOMBGVu4vbXJD8pWi7y5/N3UporL2F5zPW G4Y5MveVGJSn9inM19QcZE9ab8kBN55gtu5HqvLYdtMHgT7PPfLbmOXILIzidqULqFE2 lCmm3T8K+vR0KelCyNe0SJFqh6kTOgVKpLRt2sFIPheAgIyAEO9HoLgv9oMYd5B6fiFD Y3dMxGS19TRYXFXqaabKjm0nrJ86BnYdbwZOYs+qGlsE95a4RT6p03f4znTah5ANJDW0 n52Q== 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=0HMQNZm3VL870uU3kGRywoL/gavdjO/TYOrKDp2c+WQ=; b=c7B6WqVaii9Lv0o5r7gTL7Kdvu2VCiT6nSUyWieNEHQJ1qMU0P9eA/eUHT/A/LdpFl h2+H/s7az6W4q2PkgvsgLF9lbexdnDgz5KO6RIPcjtFLyx85e1R6xUHju5JVyZf0by/K SBgVc5mqcEwiybZ/DOebTagdlLUVnzIb2yVcivhOa9i+KbTvJlsRzrUx1Y1uKCszUGAC QyMgOrYKX1PLS/N7I01jigGHvaWLoo1/eWBvJQRoD4HCPjmFrf4KGF+JVqKNQWg/8dq5 BghlYwjRTgaMeJA/v+ChGZGRFoMBmqx1S2idIgFgkaABiuyp1136Ka+IfDjmKP2EnUYE Y9gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=WssuH5NU; 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 c76si8430255qkh.349.2017.08.07.08.46.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Aug 2017 08:46:49 -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=WssuH5NU; 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]:38054 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dekEw-0003MF-Uu for patch@linaro.org; Mon, 07 Aug 2017 11:46:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dek8A-0004fB-0u for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dek85-0006ZV-8J for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:46 -0400 Received: from mail-wr0-x231.google.com ([2a00:1450:400c:c0c::231]:33376) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dek85-0006Ys-2B for qemu-devel@nongnu.org; Mon, 07 Aug 2017 11:39:41 -0400 Received: by mail-wr0-x231.google.com with SMTP id v105so3325195wrb.0 for ; Mon, 07 Aug 2017 08:39:40 -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=0HMQNZm3VL870uU3kGRywoL/gavdjO/TYOrKDp2c+WQ=; b=WssuH5NUhfxobN/1rAMQShyYCtN6Y3aZcmMbrdxOMCTp1m3fggn9O1mHOI4NTuVW6e G1cteREbVRAerCzdFBiN8+9sD7fHNIazyE5oP7n+wwdLduWYNnKNcHH1/20yIfBNESE/ E7lFaMIDuRD9kVju/k8LxHnLR2yfGyMFjtDYc= 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=0HMQNZm3VL870uU3kGRywoL/gavdjO/TYOrKDp2c+WQ=; b=QDnqiQuY6yQSH9ew6voTTmXLZo/0+yajOIM2OdSaQ/A3woC2zjYQlW6xx/LvN3iD0b 8CBvPa0IT6VbCTH2GAphqtLgpmPfzV+TJMEoIS+TpTRqKGCNc6q9ruyrlK0bQ5vTYhRm pOkbIPeeWorkxyLK8/XEbaRPvhpPxXp3Kv8Qh1qNJgohGjvwI4mLj/aXbjdtfNZZBrAW RBX6ZY/e3+PcHTFXu4zHVNRLN0tD2e2YWSIZZ+l4NISCY00yx97bYVQFiZtTHmN92dGt 4eaVCnpAeJ/eyDqsbkp7FeISWGEfMnPqYCAGt+FLcJP5kPpENX0yLylqVJ7qUsajHejI tfGg== X-Gm-Message-State: AHYfb5ggIUMD2KBS6wFyjmsMLepz4hSq+7eBnzhdMvGFfVrW//K2tgb0 wunScYbSlDp2h3kg X-Received: by 10.223.136.78 with SMTP id e14mr698788wre.84.1502120379965; Mon, 07 Aug 2017 08:39:39 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c34sm18996963wra.80.2017.08.07.08.39.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 07 Aug 2017 08:39:38 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 9F7143E04E4; Mon, 7 Aug 2017 16:39:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 7 Aug 2017 16:39:31 +0100 Message-Id: <20170807153934.29477-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170807153934.29477-1-alex.bennee@linaro.org> References: <20170807153934.29477-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::231 Subject: [Qemu-devel] [PATCH for 2.10 v3 3/6] 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 Reviewed-by: Eric Blake --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.13.0 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; \