From patchwork Fri Oct 28 16:33:34 2016 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: 79988 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp1274720qge; Fri, 28 Oct 2016 09:53:34 -0700 (PDT) X-Received: by 10.176.1.9 with SMTP id 9mr13346058uak.112.1477673614918; Fri, 28 Oct 2016 09:53:34 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i20si6678623uaa.249.2016.10.28.09.53.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 28 Oct 2016 09:53:34 -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; 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 dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50654 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c0APN-00059M-Od for patch@linaro.org; Fri, 28 Oct 2016 12:53:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c0A6H-0004kH-OY for qemu-devel@nongnu.org; Fri, 28 Oct 2016 12:33:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c0A6E-0003GR-Ij for qemu-devel@nongnu.org; Fri, 28 Oct 2016 12:33:49 -0400 Received: from mail-wm0-x22a.google.com ([2a00:1450:400c:c09::22a]:38182) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1c0A6E-0003Fq-AX for qemu-devel@nongnu.org; Fri, 28 Oct 2016 12:33:46 -0400 Received: by mail-wm0-x22a.google.com with SMTP id n67so125562061wme.1 for ; Fri, 28 Oct 2016 09:33:45 -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=H/iq+KmBgA5vkjJOUUavGCzYZMvAoznfgxZomvXP5v8=; b=eTN8BiJzue6XbQCCBH7gkfvdS5AKDWBaCHxQxI73pUaucJ8heqS8fDo4UfU0BsHeOe hjSMrzB608RkLyZDG3Aia5x6FeVGyj8arZL0E4SnHYXrRCrIAjYVzk4Vk2gTGxxFBw1s wqKOJLfWh6b74mxHdmdWGfX62odI/gFdk7oe4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=H/iq+KmBgA5vkjJOUUavGCzYZMvAoznfgxZomvXP5v8=; b=hziCRUEBMIXysvsfX6mOmMhuldrrC/xdBf2e5TblCFYzbGTjA0WGpXTuexgjkWjex6 T0NfXU3aYf6f8hfQrnLflTWrBycUHJO4HcNss1owH7peq2hVkBAvcOrhvdtXG6e/T3Gw zd8DEnNIAB90dYhXZ2Chj+3t4zMFoodns4wN5BS3wQ45gXWu7MVPVudc2pmE8C5ef9Rm zSlDFQR2XjWB7M0XuiSNBxry5ncS0AkvUQjphyT2Lew+0RvKBlkrgP09UvCcLadT/Icq hyupK9Gu4giIIfXaoeKZegLrlhVdH3+CJHjcqxweM3Ht3rmTryU3pz5mL8QEv0lruWC6 rv8A== X-Gm-Message-State: ABUngvdDphkEOzb6DFBJWywMNEo5WTmzp3VKWMK8rN/6r+OL/Xo6qgFeNE59lIT6rVA8VCO5 X-Received: by 10.194.126.130 with SMTP id my2mr6997723wjb.164.1477672424118; Fri, 28 Oct 2016 09:33:44 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id rv12sm14933858wjb.29.2016.10.28.09.33.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Oct 2016 09:33:43 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B9A593E01B2; Fri, 28 Oct 2016 17:33:42 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: famz@redhat.com Date: Fri, 28 Oct 2016 17:33:34 +0100 Message-Id: <20161028163339.31096-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161028163339.31096-1-alex.bennee@linaro.org> References: <20161028163339.31096-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22a Subject: [Qemu-devel] [PATCH 1/6] tests/docker/Makefile.include: fix diff-index call 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?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The whole thing is wrapped inside a call quiet-command as well as being the actual call taking a --quiet argument so the redirect is superfluous. For reasons I have yet to determine this also seems to be causing the source preparation step to skip stashing work tree stuff. Signed-off-by: Alex Bennée --- TODO: - properly understand the failure --- tests/docker/Makefile.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.10.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 3f15d5a..d91e28b 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; then \ git archive -1 HEAD --format=tar.gz; \ else \ git archive -1 $$(git stash create) --format=tar.gz; \