From nobody Wed Nov 5 02:52:42 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500989999155851.1346680166172; Tue, 25 Jul 2017 06:39:59 -0700 (PDT) Received: from localhost ([::1]:60843 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da040-0007w8-Qb for importer@patchew.org; Tue, 25 Jul 2017 09:39:52 -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) 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) 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) From: =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=20Benn=C3=A9e?= , famz@redhat.com, qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e Reviewed-by: Eric Blake --- 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 ?=3D % # Make archive from git repo $1 to tar.gz $2 make-archive-maybe =3D $(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/nul= l; then \ git archive -1 HEAD --format=3Dtar.gz; \ else \ git archive -1 $$(git stash create) --format=3Dtar.gz; \ --=20 2.13.0