From patchwork Thu Jul 20 16:00:42 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: 791689 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="ZG+kV/TT"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xCzK60fw5z9s74 for ; Fri, 21 Jul 2017 02:05:59 +1000 (AEST) Received: from localhost ([::1]:38935 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYDxZ-0004Nk-SG for incoming@patchwork.ozlabs.org; Thu, 20 Jul 2017 12:05:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYDsp-0000Zs-NF for qemu-devel@nongnu.org; Thu, 20 Jul 2017 12:01:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dYDsn-0007a2-ST for qemu-devel@nongnu.org; Thu, 20 Jul 2017 12:00:59 -0400 Received: from mail-wr0-x230.google.com ([2a00:1450:400c:c0c::230]:36581) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dYDsn-0007ZX-Mq for qemu-devel@nongnu.org; Thu, 20 Jul 2017 12:00:57 -0400 Received: by mail-wr0-x230.google.com with SMTP id y43so72597077wrd.3 for ; Thu, 20 Jul 2017 09:00:57 -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=ZG+kV/TTdJtAiFh5nYAOLDgBKhKokh640Xebcn8Jo5Oz8Pne6dnjbpkKSjq0x5vj3L Akwr2cicQp39IT2O9leSXgETfFtQrA+QOqIKdCM4kBuwtpNjKxxI315xVLRxhpYzl/FA Tpbw8Wcxdu7T3ADcJ0x0eIaq4xLJVa9X/IFAs= 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=tOkCooBAHh34SFlgmpg3ITFpy7wMtsCgoVQwcfWQTfm9MnsIbuV8C2XfuOhchOc9zW Ps2/tGrkakH+ZK23anqDXP6goi6x7J1ktvQDDH5QwO1xUCoeCx8tUZs4mbyyZ4yczUaS 4THEJzJbCLIamnR5sLzyAzWXNNLd1rJEkdW9Bc9G1NIpu+NNBjSsYzPIzArjMIV5Zm2x Bx/X8eFVK+a1/MZeOOEBmlTD6yAjXrp2WJjtiXEbKfw9BQH7v+QeXixqOjwrIZdKfneG KW38dn/mpZcXJg1nH8ho0dV1TPNxpE5imGaUGIcywu9Ziruhj50l/BVwK3S7DJeHZkuB SOew== X-Gm-Message-State: AIVw112XxsnLLsE9unh4R/VtC5qW8bMfmZyTRciuA6fLBYXfMAoDUL46 RdORt4iCYxwBIQV6 X-Received: by 10.223.130.120 with SMTP id 111mr7163575wrb.21.1500566456502; Thu, 20 Jul 2017 09:00:56 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d53sm4017562wrd.81.2017.07.20.09.00.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jul 2017 09:00:54 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id AAF703E042D; Thu, 20 Jul 2017 17:00:52 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: alex.bennee@gmail.com Date: Thu, 20 Jul 2017 17:00:42 +0100 Message-Id: <20170720160042.20153-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170720160042.20153-1-alex.bennee@linaro.org> References: <20170720160042.20153-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::230 Subject: [Qemu-devel] [RFC PATCH for 2.10 v1 2/2] 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: Fam Zheng , alex@bennee.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "open list:-----------------..." Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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(-) 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; \