lkml.org 
[lkml]   [2013]   [Dec]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] Fix detectition of kernel git repository in setlocalversion script
On 2.12.2013 16:14, Franck Bui-Huu wrote:
> On 12/02/2013 03:57 PM, Michal Marek wrote:
>> On 2.12.2013 14:21, Franck Bui-Huu wrote:
>>> diff --git a/scripts/setlocalversion b/scripts/setlocalversion
>>> index 0b5ccf3..c16e65d 100755
>>> --- a/scripts/setlocalversion
>>> +++ b/scripts/setlocalversion
>>> @@ -43,7 +43,8 @@ scm_version()
>>> fi
>>>
>>> # Check for git and a git repo.
>>> - if test -d .git && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
>>> + if topdir=$(git rev-parse --show-cdup 2>/dev/null) && test -z "$topdir" &&
>>> + head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
>>
>> You can do test -z "$(git rev-parse --show-cdup 2>/dev/null)" without
>> the $topdir variable.
>
> No, "$(git rev-parse --show-cdup 2>/dev/null)" would also give the empty
> string if the git command fails (ie not inside a git repository at all).

Then git rev-parse will also fail.

Michal


\
 
 \ /
  Last update: 2013-12-02 17:01    [W:0.058 / U:0.412 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site