From patchwork Tue Jul 25 13:34:22 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: 108643 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp583128qge; Tue, 25 Jul 2017 06:40:03 -0700 (PDT) X-Received: by 10.55.180.197 with SMTP id d188mr25329223qkf.181.1500990003446; Tue, 25 Jul 2017 06:40:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500990003; cv=none; d=google.com; s=arc-20160816; b=J3rz4X2GrYV+H3zB2ro1F4/3xqZZ8IuFbbhfy78RnldjGXOT8NbBdM9Gxiz2rn+uXS viURGvK+uSx7/3wcxlGJdfCWUjVcUrO2oJEqeSiCVeIoEIaLXCgIT6eltnGSL6cbToxP vC2W5k+b35Z/llhqH+tsdfqC+3F2bO12wQYrkrzNoi2pY6pQWxvP+35ntU2HWiXNYix8 qjnEJItEezW6ej6TuNq1IdpMfx7+2fz3PgZ2ANQzzkTmUAw4dy10FtXnBI2OXK7Ybiz2 asPFq2mYmQH8v2fg48AgvjWT4IvxV8qu/DodsdMuFr1RdUXEiaYJIGetBzk9470TDQ+U Ua5Q== 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=dnaj68+9Sf8KD8j2gDCd+29lR4N1jaS7Y4XPH+mBh4XWzzyEC1DzAueXZY1lKFAbAS RXPw31AkJgzAuwLFf7wc6tsSZ2KX4Fzfr78c00IHNBkxshTRbcOY9i/5DNDtxM0JdzUj Dzlv7RtG8BT5fWACIdxzk2vQlOE2Rty3x0jb2unRgU6d5lIvVqASYbtOpBcX66vO3jTV GXmbIRVAEhgHRtruqbZt+hu4j6FFgpoo25tphSFZpluhnrX5NfuxYgjgvPwS+7QhObfq h+U2Y3GryS6iDlb1U3TK1RM8SKbN24u+q+TZ1aY0eiqAK7QunOmThdJ30sBte6kdhn33 HrXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=JjCYh7KW; 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 m65si2503296qkm.541.2017.07.25.06.40.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 25 Jul 2017 06:40:03 -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=JjCYh7KW; 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]:60843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da049-0007w8-1k for patch@linaro.org; Tue, 25 Jul 2017 09:40:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44531) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZzys-00047R-44 for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZzyo-0004O7-C5 for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:34 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:34911) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZzyo-0004NU-4y for qemu-devel@nongnu.org; Tue, 25 Jul 2017 09:34:30 -0400 Received: by mail-wm0-x231.google.com with SMTP id c184so52331438wmd.0 for ; Tue, 25 Jul 2017 06:34:30 -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=JjCYh7KWpOypNJkqgGCerdt40Q9VbBP4R67pUaH0m7MFb1E5CTaY2VudNmMnyaHRX7 Mo9327WmmLYlU2ShBG+cKBZDxZtfr/iiR6E1NA+94JT5lidtK7ZkapcQn4MA9KVy0ZVK J/Nl7BTeMWnczj0nZS+nFzqZ24WUWPOf3nC90= 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=Oco1CoTeGIpWWNDAKaT42M/NlxDoBXRNN7MQaTFzGkDxR7apvAP50qzRbzSKVs4UrY MWinXjeIEHf1GkCLZDFa21KRcIwdWlqp2QvcqBANEnUYkPKHQov0PuwvMXNK7IdMIjN0 6Gex18cQDwV1XabdkfaBbbdGNwhVhUJYXcntYZJpc545hGhBwLJQJB2EWKtJq07/q6H1 2nv1+EnqkVMvKW4RNxYUsM5Zh8dx4JD/i5kAIftTNQ82y2vLLikc7/mq6o36nxShYS5o EvOvZVp/r1c5Bx/CdsqFeEktlaR3+/YAvPXZZvlz/rzLVcL9q5loW+UloYvwqXjKxK/9 KMAQ== X-Gm-Message-State: AIVw111A+IOAQeGNahbXL+MmEzcFu+aIUgC5gbobWwOJAbLfsGbbASGx oKLSb3q47QrhwBia X-Received: by 10.28.185.210 with SMTP id j201mr7545016wmf.52.1500989668957; Tue, 25 Jul 2017 06:34:28 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v16sm18283320wrc.65.2017.07.25.06.34.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Jul 2017 06:34:27 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 662303E05D3; Tue, 25 Jul 2017 14:34:25 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 25 Jul 2017 14:34:22 +0100 Message-Id: <20170725133425.436-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170725133425.436-1-alex.bennee@linaro.org> References: <20170725133425.436-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:c09::231 Subject: [Qemu-devel] [PATCH for 2.10 v2 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; \