From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Monjalon Subject: [PATCH] scripts: hide double git reference check error Date: Mon, 29 Aug 2016 10:35:35 +0200 Message-ID: <1472459735-11683-1-git-send-email-thomas.monjalon@6wind.com> To: dev@dpdk.org Return-path: Received: from mail-wm0-f41.google.com (mail-wm0-f41.google.com [74.125.82.41]) by dpdk.org (Postfix) with ESMTP id BA8FB2142 for ; Mon, 29 Aug 2016 10:35:46 +0200 (CEST) Received: by mail-wm0-f41.google.com with SMTP id o80so79544822wme.1 for ; Mon, 29 Aug 2016 01:35:46 -0700 (PDT) Received: from XPS13.localdomain (229.202.154.77.rev.sfr.net. [77.154.202.229]) by smtp.gmail.com with ESMTPSA id d7sm33197973wjg.13.2016.08.29.01.35.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 29 Aug 2016 01:35:45 -0700 (PDT) List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When checking a git reference which does not exist, a git error with the long git-branch usage is printed: % scripts/check-git-log.sh '-1 3780cbd' error: malformed object name 2de9f8551ff9 usage: git branch ... [a lot of lines] Wrong 'Fixes' reference: Fixes: 2de9f8551ff9 ("ethdev: fix documentation for queue start/stop") The error from the script is sufficient so the git error can be hidden. Signed-off-by: Thomas Monjalon --- scripts/check-git-log.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check-git-log.sh b/scripts/check-git-log.sh index e416aea..6137098 100755 --- a/scripts/check-git-log.sh +++ b/scripts/check-git-log.sh @@ -180,7 +180,7 @@ IFS=' fixtags=$(echo "$tags" | grep '^Fixes: ') bad=$(for fixtag in $fixtags ; do hash=$(echo "$fixtag" | sed 's,^Fixes: \([0-9a-f]*\).*,\1,') - if git branch --contains $hash | grep -q '^\*' ; then + if git branch --contains $hash 2>&- | grep -q '^\*' ; then good="Fixes: $hash "$(git log --format='("%s")' -1 $hash 2>&-) else good="reference not in current branch" -- 2.7.0