From patchwork Fri Oct 30 20:57:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 55854 Delivered-To: patch@linaro.org Received: by 10.112.61.134 with SMTP id p6csp84182lbr; Fri, 30 Oct 2015 14:05:27 -0700 (PDT) X-Received: by 10.107.3.72 with SMTP id 69mr11898830iod.75.1446239127059; Fri, 30 Oct 2015 14:05:27 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id j194si9310345ioe.4.2015.10.30.14.05.26; Fri, 30 Oct 2015 14:05:27 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dkim=neutral (body hash did not verify) header.i=@linaro_org.20150623.gappssmtp.com Received: by lists.linaro.org (Postfix, from userid 109) id 7FC4462C6E; Fri, 30 Oct 2015 21:05:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id ED9A262C7D; Fri, 30 Oct 2015 21:03:08 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id E14C062C72; Fri, 30 Oct 2015 21:02:34 +0000 (UTC) Received: from mail-lf0-f54.google.com (mail-lf0-f54.google.com [209.85.215.54]) by lists.linaro.org (Postfix) with ESMTPS id E233362C76 for ; Fri, 30 Oct 2015 21:01:57 +0000 (UTC) Received: by lffz202 with SMTP id z202so39515976lff.3 for ; Fri, 30 Oct 2015 14:01:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=W1TRsrk7rUR9/081fRFnr33JvCgNWKnK7EeOd++6JzE=; b=K/afPG44yG9vDKJcIARMiXoM1hNiBByPRzfZHOgzHO+IRREDxhgZam3xIg2jD0sPE4 UznEtmc6sVocoqGYsY1V5jnSnhg2miAo3Ij11puAcv9Fuwg4H7OaINxWdnOiom6O3Nhv xcRJA2Up/9KQEVEvJc8ZO8odzTnotBPhwseVYqiEbv6OhKn1A4Al8bkoYvzFY5um0geX UYZjXaAD8ErRpJgAeR7zM1pix2OhiFcj/jahiQK0DCzEFJ4PIpEguaUJ0vIdoKUHqMIq 5T/lXSoK1tdzRYMgsHGMyqVDbiInKVq9zFyPOYe06xlWNyXcYvYL9rMl/X2BVu+D1kpt jitg== 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; bh=W1TRsrk7rUR9/081fRFnr33JvCgNWKnK7EeOd++6JzE=; b=CfcRoqom8JNQUzZJGjEn+uQD/omcXrikon2x55R5moBaf0DPwUkdZW+2QMWruIxEtY FVRby6+Z0lRGMSrZbKk6qNK9+stnaue7PYW3JW9sMx1qGaLo/TZ3547qUvN9ppRHf7QO xJdfl+Tse5xxnHTDlKBhS794TN+9S35IgDDB8Vyx4Q/4kNNBLvq+fgyXewM72YZZ21H9 gifU95xM7e8N6OzUdw0VBEc4LCjefY2dNZpYiQpLblzJsNL8yt7txNadQE6ocBlUoTes 6+Nl+HBPOgYN268P2lDsA6pdSM22bJ04QDYI+xIXdssoJALTAl+eCMgh6AkHFsNR/itG RROg== X-Gm-Message-State: ALoCoQk+h9MuOUExZu5W6HJWdyJegM2Dzqa7gH8fqNKKSowIoRqEGXHgdk3YweyQUqFtBJqA5f9I X-Received: by 10.112.54.130 with SMTP id j2mr4137500lbp.120.1446238916788; Fri, 30 Oct 2015 14:01:56 -0700 (PDT) Received: from localhost (c-893970d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.112.57.137]) by smtp.gmail.com with ESMTPSA id wj8sm1563948lbb.44.2015.10.30.14.01.56 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Oct 2015 14:01:56 -0700 (PDT) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Fri, 30 Oct 2015 21:57:43 +0100 Message-Id: <1446238668-15200-4-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1446238668-15200-1-git-send-email-anders.roxell@linaro.org> References: <1446238668-15200-1-git-send-email-anders.roxell@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCHv2 3/8] scripts/git_hash: fix bug where dirty was always set X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Signed-off-by: Anders Roxell --- scripts/git_hash.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/git_hash.sh b/scripts/git_hash.sh index e15094e..fc0b057 100755 --- a/scripts/git_hash.sh +++ b/scripts/git_hash.sh @@ -9,7 +9,8 @@ ROOTDIR=${1} CUSTOM_STR=${CUSTOM_STR:-https://git.linaro.org/lng/odp.git} if [ -d ${ROOTDIR}/.git ]; then hash=$(git --git-dir=${ROOTDIR}/.git describe | tr -d "\n") - if git --git-dir=${ROOTDIR}/.git diff-index --name-only HEAD &>/dev/null ; then + if [[ $(git --git-dir=${ROOTDIR}/.git diff --shortstat 2> /dev/null \ + | tail -n1) != "" ]]; then dirty=-dirty fi