From nobody Wed Nov 5 05:25:45 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 1533301992726701.5323067303182; Fri, 3 Aug 2018 06:13:12 -0700 (PDT) Received: from localhost ([::1]:51068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flZt4-0007MC-Ha for importer@patchew.org; Fri, 03 Aug 2018 09:12:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49035) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1flZeW-0002db-9t for qemu-devel@nongnu.org; Fri, 03 Aug 2018 08:57:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1flZeS-0002bG-Fu for qemu-devel@nongnu.org; Fri, 03 Aug 2018 08:57:56 -0400 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]:33571) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1flZeS-0002ah-8W for qemu-devel@nongnu.org; Fri, 03 Aug 2018 08:57:52 -0400 Received: by mail-lf1-x144.google.com with SMTP id u14-v6so4018122lfu.0 for ; Fri, 03 Aug 2018 05:57:52 -0700 (PDT) Received: from SEJKG-L-LAN04.air5.flaktwoods.net (static-74-253.wetternet.net. [92.42.74.253]) by smtp.gmail.com with ESMTPSA id x65-v6sm704866lfa.77.2018.08.03.05.57.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Aug 2018 05:57:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dracc-se.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=dGyKQP5n/BkB3ZLey5H5EmtZk72hYhvBmiV8cHMI2Kw=; b=N0Ro9UJlG1kQzNe/9YaKKghPm2BflICU0VBQxqhcg/jB8g1zi/nGXVY1w1NnyfaJ8M VYdmySlVHGzKay0hQkC8+rDd5QhwEPM6acNpBM3SkQWIm4ZOFPWlaXVbEhXMA6l65X9P /wEeqaEzPOHITwcRrccR5UyFamixSBHGCoP9u+OfJ/dxLMFmmbp6YDAxfL227SPRgvQN /2pCAK4BfR/NONufCOscWCaMvQmIcC2X7sczCxqNUqZbyZrNQ98WFYM04wHGpo5IT+x3 OTeib887Ism2D1MVuL/HcHb683wrgmBWhSHqXwFUCFECw/xBg6IJRzKe1jB/cQYXEYqm Dwvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=dGyKQP5n/BkB3ZLey5H5EmtZk72hYhvBmiV8cHMI2Kw=; b=YgxJdwFpleZkFC0QJLau3djGovacUpgaaOlWl/WVIHeGP87wcZoouZ44J7uqMgDeEn zPAVT4ByuxGW7Nx71ejI911/MHZgYTUZVTmXA+kIAx8HaOec8cVZ/JCiq6xon6xN25xV +WW4bjtarC8iyHwgQexoLHURnm8DUu2t7dXXF6wlcbjtuqFlt60W8xVAKox49OH25zP1 Lz9q/aOqoB34q2mIDi2YGaWFHIiBqLLlnUKTY42NksQiZu1x46yaJIfwdiYztZ1xPtRO xoHBhSSyOHFFwv1D72aFfP3UG+t3e335Ta7K7IyDpP95AQQGouQRmELekAgyEagUEAEY 6snQ== X-Gm-Message-State: AOUpUlEz71RFKOTWK2Qdrn842vx6ZsgBHxstqFgSaaScm8ESk3vEWjm6 yiRRBSpEby61fyTrirsZiFbl+Wq8qdmRjsSpmJA= X-Google-Smtp-Source: AAOMgpcJy1HrrtUZd6JuD3FWzdMhL1e7iSrwQzdj0wzbkKqv+g3nNsuppve+inKW1/Yadm2BE0y0ow== X-Received: by 2002:a19:4a03:: with SMTP id x3-v6mr4883709lfa.136.1533301064563; Fri, 03 Aug 2018 05:57:44 -0700 (PDT) Date: Fri, 3 Aug 2018 14:57:42 +0200 From: Lucas Eriksson To: qemu-devel@nongnu.org Message-ID: <20180803125736.GA3476@SEJKG-L-LAN04.air5.flaktwoods.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.0 (2018-05-17) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::144 X-Mailman-Approved-At: Fri, 03 Aug 2018 09:11:55 -0400 Subject: [Qemu-devel] [PATCH] Makefile: Don't add -dirty to pkgversion when tree is not dirty 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: qemu-trivial@nongnu.org, marcandre.lureau@redhat.com 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 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" On a clean just-cloned repo, git-diff-index has no local index to compare with, leading to all files being marked as new on some systems. git-diff on the other hand actually compares the files contents with the repository tree and then updates said local index. This problem was found when trying to automate xqemu builds (an xbox emulator based on qemu) through the use of AppVeyor. Signed-off-by: Lucas Eriksson --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2da686be33..7b48c43734 100644 --- a/Makefile +++ b/Makefile @@ -446,7 +446,7 @@ qemu-version.h: FORCE else \ if test -d .git; then \ pkgvers=3D$$(git describe --match 'v*' 2>/dev/null | tr -d '\n');\ - if ! git diff-index --quiet HEAD &>/dev/null; then \ + if ! git diff --quiet HEAD >/dev/null 2>&1; then \ pkgvers=3D"$${pkgvers}-dirty"; \ fi; \ fi; \ -- 2.18.0