Re: [PATCH] Fix detectition of kernel git repository in setlocalversionscript

From: Franck Bui-Huu
Date: Mon Dec 02 2013 - 10:14:21 EST


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).

Thanks.
--
Franck
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/