From patchwork Thu Jul 20 16:00:41 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: 108422 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2327439qge; Thu, 20 Jul 2017 09:09:54 -0700 (PDT) X-Received: by 10.55.72.1 with SMTP id v1mr5362732qka.0.1500566994900; Thu, 20 Jul 2017 09:09:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500566994; cv=none; d=google.com; s=arc-20160816; b=M8z0qpzro7BKZV9Jp4xqNTEGz4J6hREb+JPfi1obJ2DnZ+/8wCL47KSE1b3A1JpUPL TlH6FFxoOIfnUnZpg3xUzD8qtZbzN00sxOOrBniCXdzu186VMaeT9cS1xa1KyYkvIIPm hWgTwXglv4m0k/JCeUJFZfIvEUA0tR4ZGhtvXs/lTVGGdEA4DzqAmScV5tGci2ixVRYa obDswk0D3MUp/JeR2tJFOZXVvdndRE22K+ulzp/vADarC+yO/NXzujFiYOmhcu99BtXa sEsmUHfkHRaJwTAjmcHXYzOSyM7cnR9Ro9apNcOW+eMoQ9lOc08nsJiwoOn5fUKVnW4d d1Ig== 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=LxXBJ4EUlB5PYLiG5mV46/CbrpcOoHRkfUQiYp9fp/c=; b=g83r0urDv6ouU9Gy+jE5TLAdHPoB3xl0JFK69U0/zRvKmTnTttj8bPOltvu6EQ4WOa XtblIaKlD4WPap9UeRrPplNIsTUdLloN6RRO5Blq5YE+DkIclIsHto+xOMb4h4eBFsEY hUR2NgFICeMiqHF20/WCpyYgXDXSEas3dzRqVj7T+pzjnd1HjfIJhsMdqumPHakwzKrl gcAzAMaDiipStd4mlvmm0fruuOYMiBa2aAW1UL0hoPIM9ulrSmQmWSgfVw7VeupAP7ey AfUstXqEY5Bss7SI5LfUh0uL+fJsAlklJ1dC0wDCklvPGGu32WaKiMBiTpjUPK8rBuuC zZFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=GUdpXb8q; 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 i44si2156875qtc.310.2017.07.20.09.09.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 20 Jul 2017 09:09:54 -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=GUdpXb8q; 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]:38969 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYE1P-00071y-Vm for patch@linaro.org; Thu, 20 Jul 2017 12:09:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41632) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYDsq-0000aT-Bn for qemu-devel@nongnu.org; Thu, 20 Jul 2017 12:01:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dYDsm-0007Z4-Oc for qemu-devel@nongnu.org; Thu, 20 Jul 2017 12:01:00 -0400 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:35291) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dYDsm-0007YE-Hy for qemu-devel@nongnu.org; Thu, 20 Jul 2017 12:00:56 -0400 Received: by mail-wm0-x229.google.com with SMTP id w126so28369393wme.0 for ; Thu, 20 Jul 2017 09:00:56 -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=LxXBJ4EUlB5PYLiG5mV46/CbrpcOoHRkfUQiYp9fp/c=; b=GUdpXb8qpdqExXDv8M5DeKqKzS0v8xji7uZEnATqfLbXhvslL0ujIZbWA1iJzOAi8W dk3anBCbGPGYlkXJ3xapfY812W/T5XwuiETa+QlvcQLdFX3op4kH7H3lMwPt6/FIFJsE p/P2DChHVR9k09JulVoqr7Wrha9/lpgbRZW/4= 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=LxXBJ4EUlB5PYLiG5mV46/CbrpcOoHRkfUQiYp9fp/c=; b=OWOriTH6nP50scF6G5F9WyK42i3AGPze206FuyARvgJ3jAffuLQj/UPE8NJj2UpG/2 lnqyohcNbxhvc6oLL8aRJYPdcHfMbBwpPArM1/R1xrirPdUNner10tq7peQ/fLqg+DJ+ pYp8VN88ZWGDt0ZFpUL+TuWbDgm6yCNxaRutH6f4VD9Pf/ztA5VYDMmhGUUBUJQhNY0l 7yIVVMZuEQ0NxOMq9U5dMNsdjlXGFR0zxI8j6K8Hnx7bNz18pXDokBmFvpj/LJwjv4kL G+LccFVD5vuc+iF3qRzXKkHLa4r06m0Hv6xQ4q8GPbbq5ZR7y/B04XjBhvhqjY0i/Tvv IzxQ== X-Gm-Message-State: AIVw110A9T75D61rVDXGMhmPg5LQHHCcVwLodi4q3QraEoz4UHatWNeC QfkqWh2EMJJ3qPOm X-Received: by 10.28.58.80 with SMTP id h77mr2783074wma.13.1500566455294; Thu, 20 Jul 2017 09:00:55 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v25sm3962531wra.2.2017.07.20.09.00.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jul 2017 09:00:53 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 99E553E03F0; Thu, 20 Jul 2017 17:00:52 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: alex.bennee@gmail.com Date: Thu, 20 Jul 2017 17:00:41 +0100 Message-Id: <20170720160042.20153-2-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:c09::229 Subject: [Qemu-devel] [RFC PATCH for 2.10 v1 1/2] docker: fix dirty/stash detection on some systems 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_Benn?= =?utf-8?b?w6ll?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "open list:-----------------..." Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" I reported this a while ago but evidently forgot to push the patch upstream. Without this I wasn't seeing the dirty tree state submitted to the docker build which is very confusing. Reference: Subject: [PATCH 1/6] tests/docker/Makefile.include: fix diff-index call Date: Fri, 28 Oct 2016 17:33:34 +0100 Message-Id: <20161028163339.31096-2-alex.bennee@linaro.org> Signed-off-by: Alex Bennée --- 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 d7dafdbd27..ff580edfad 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 -- &>/dev/null; then \ + (cd $1; if git diff-index --quiet HEAD -- 2>/dev/null; then \ git archive -1 HEAD --format=tar.gz; \ else \ git archive -1 $$(git stash create) --format=tar.gz; \ 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: 108416 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2323467qge; Thu, 20 Jul 2017 09:06:54 -0700 (PDT) X-Received: by 10.237.37.136 with SMTP id x8mr5254397qtc.326.1500566814025; Thu, 20 Jul 2017 09:06:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500566814; cv=none; d=google.com; s=arc-20160816; b=MzOc1YPny8faWC3F84YoKy44EYJaLGIyQaeJGEnWkUAADmR/NH6NzBtCzJ805m18sw 0A/0Bpahia77JfmFf5p70kMn7c94Hl+KT979NygSOmWS8OCZFHGiCq3juz6St1ixJCth dsvP9y89Tyc3tr1ZrAqqcGKnW6DKXirwhaBTWv6zlNv8lvwqR2llDz5Qbu+Libp6f2RF ctJdEgZkwHdiklY5C8mew+vlIUQHllZOZnAck+ReKqmS4QvFNhUlb80zDcfwh+I5c/GF h3kxQ3EOczQvt5ZVqejwaMajsXGLS946chQnd+ty/vCzY7e3rdIAuJyJCrPLigbJB+Rg uWyg== 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=z2TbaDo+CRfIXPA6RwiyKheuspiA3WpEjdEgVN8jGjP3pEpDKNveHFw3PW6uXN0oMu 6w+IyYz62DRd2c8n6crJc2Ym8GvFl/1/WVFIAlTW9kfkJrIFWOBVyz388eAb68vQ6dp9 TzblikPIfXGiYEmYQZijrjzXSaa0th+kF2xydnLB7wro1b5dOE2hhCyxoehOnNfkH7m2 ZNv3hCy8MH3fRzg8c+0T3cg6Kb8lglVjO79fhK2Scc63/wAATaWUU1XC2qRQlJrCtW/S JKaFX+pqDJgTgHYRSNWB0pET4zc9bcXb673DBflJAzU1zrD2UMZK2MPNTO3z3i6N7e8x LkBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.b=ZG+kV/TT; 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 u76si2211947qkg.535.2017.07.20.09.06.53 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 20 Jul 2017 09:06:54 -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=ZG+kV/TT; 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]:38943 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dYDyV-0004wq-Og for patch@linaro.org; Thu, 20 Jul 2017 12:06:51 -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_Benn=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_Benn?= =?utf-8?b?w6ll?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , "open list:-----------------..." 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 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; \