From: xufeng <xufwang@163.com>
To: Nico Schottelius <nico-linuxsetlocalversion@schottelius.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
wsa@the-dreams.de
Subject: Re:Re: [PATCH] setlocalversion: fix error detectition of kernel git repository
Date: Sun, 22 Jan 2017 10:10:57 +0800 (CST) [thread overview]
Message-ID: <72db5a75.262c.159c3f0d601.Coremail.xufwang@163.com> (raw)
In-Reply-To: <87a8ak876p.fsf@ungleich.ch>
I'm sorry. My patch is error.
But I just want to get the git version when we use git as SCM. No matter what .git directory where.
Thanks.
At 2017-01-22 04:54:54, "Nico Schottelius" <nico-linuxsetlocalversion@schottelius.org> wrote:
>
>Hello Xufeng,
>
>why do you think redirecting *all* output to /dev/null is the right
>thing todo?
>
>And which problem does it exactly fix?
>
>Do you see that there is a difference between a "return value"
>(i.e. exit code) and the output (in this case stdout) of a program?
>
>Best,
>
>Nico
>
>xufeng <xufwang@163.com> writes:
>
>> 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
>
>
>--
>Werde Teil des modernen Arbeitens im Glarnerland auf www.digitalglarus.ch!
>Lese Neuigkeiten auf Twitter: www.twitter.com/DigitalGlarus
>Diskutiere mit auf Facebook: www.facebook.com/digitalglarus
prev parent reply other threads:[~2017-01-22 2:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-20 23:23 [PATCH] setlocalversion: fix error detectition of kernel git repository xufeng
2017-01-21 20:54 ` Nico Schottelius
2017-01-22 2:10 ` xufeng [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=72db5a75.262c.159c3f0d601.Coremail.xufwang@163.com \
--to=xufwang@163.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nico-linuxsetlocalversion@schottelius.org \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox