Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1563991

[PATCH] setlocalversion: fix error detectition of kernel git repository

Show all headers | View raw

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 <xufwang@163.com>
---
 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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] setlocalversion: fix error detectition of kernel git  repository xufeng <xufwang@163.com> - 2017-01-21 00:30 +0100
  Re: [PATCH] setlocalversion: fix error detectition of kernel git repository Nico Schottelius <nico-linuxsetlocalversion@schottelius.org> - 2017-01-21 22:20 +0100
    Re:Re: [PATCH] setlocalversion: fix error detectition of kernel git  repository xufeng <xufwang@163.com> - 2017-01-22 03:30 +0100

csiph-web