From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752516AbdATXYV (ORCPT ); Fri, 20 Jan 2017 18:24:21 -0500 Received: from m50-132.163.com ([123.125.50.132]:49033 "EHLO m50-132.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752058AbdATXYT (ORCPT ); Fri, 20 Jan 2017 18:24:19 -0500 Message-ID: <1484954637.5246.4.camel@163.com> Subject: [PATCH] setlocalversion: fix error detectition of kernel git repository From: xufeng To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, nico-linuxsetlocalversion@schottelius.org, wsa@the-dreams.de Date: Sat, 21 Jan 2017 07:23:57 +0800 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.22.4 (3.22.4-2.fc25) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: DNGowADHPewNnIJYnUsfCg--.49667S2 X-Coremail-Antispam: 1Uf129KBjvdXoW7GF45Ar4UWFyfCFyrXF48Xrb_yoWfJrX_WF 1kZrs2gFW0ya1Yv3W8tw45Ar1vk34rWrZavan3X348Aa18uw4fZF92qr95Jrn3JFnF9rZx urZI9ry3KryxGjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU0K-e5UUUUU== X-Originating-IP: [112.254.179.248] X-CM-SenderInfo: 50xi4tlqj6il2tof0z/xtbBoQplIVQG6zc24AABs2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch fixed the error using 'git rev-parse --show-cdup' to check that git is used as SCM to track the current directory. The return value of this command is not null string when the .git directory is not in kernel topdir. Signed-off-by: Xufeng Wang ---  scripts/setlocalversion | 2 +-  1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 966dd39..7966e39 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -43,7 +43,7 @@ scm_version()      fi        # Check for git and a git repo. -    if test -z "$(git rev-parse --show-cdup 2>/dev/null)" && +    if test -z "$(git rev-parse --show-cdup &>/dev/null)" &&         head=`git rev-parse --verify --short HEAD 2>/dev/null`; then            # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore --  2.9.3