From: Andreas Schwab <schwab@linux-m68k.org>
To: Genki Sky <sky@genki.is>
Cc: Brian Norris <briannorris@chromium.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Douglas Anderson <dianders@chromium.org>,
Guenter Roeck <linux@roeck-us.net>,
Christian Kujau <lists@nerdbynature.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks
Date: Sat, 10 Nov 2018 11:42:11 +0100 [thread overview]
Message-ID: <m24lcpjjss.fsf@linux-m68k.org> (raw)
In-Reply-To: <20181110.085826.230851261@genki.is> (Genki Sky's message of "Sat, 10 Nov 2018 00:58:26 -0800")
On Nov 10 2018, Genki Sky <sky@genki.is> wrote:
> On Fri, 9 Nov 2018 10:34:37 -0800, Brian Norris <briannorris@chromium.org> wrote:
>> diff --git a/scripts/setlocalversion b/scripts/setlocalversion
>> index 71f39410691b..eab1f90de50d 100755
>> --- a/scripts/setlocalversion
>> +++ b/scripts/setlocalversion
>> @@ -73,8 +73,19 @@ scm_version()
>> printf -- '-svn%s' "`git svn find-rev $head`"
>> fi
>>
>> - # Check for uncommitted changes
>> - if git diff-index --name-only HEAD | grep -qv "^scripts/package"; then
>> + # Check for uncommitted changes.
>> + # First, with git-status, but --no-optional-locks is only
>> + # supported in git >= 2.14, so fall back to git-diff-index if
>> + # it fails. Note that git-diff-index does not refresh the
>> + # index, so it may give misleading results. See
>> + # git-update-index(1), git-diff-index(1), and git-status(1).
>> + local git_status
>> + git_status="$(git --no-optional-locks status -uno --porcelain 2>/dev/null)"
>> + if [ $? -eq 0 ]; then
>> + if echo "$git_status" | grep -qv '^.. scripts/package'; then
>
> Shouldn't this be:
>
> if printf '%s' "$git_status" | grep -qv '^.. scripts/package'; then
>
> I.e., use printf not echo? Because of echo introducing a newline.
The input to grep should be a text file, thus should end with a newline.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
next prev parent reply other threads:[~2018-11-10 10:42 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-06 18:10 [PATCH] Revert "scripts/setlocalversion: git: Make -dirty check more robust" Guenter Roeck
2018-11-06 19:23 ` Genki Sky
2018-11-07 2:22 ` Brian Norris
2018-11-07 2:58 ` Christian Kujau
2018-11-07 3:10 ` Guenter Roeck
2018-11-07 4:00 ` Brian Norris
2018-11-07 18:44 ` Brian Norris
2018-11-07 20:43 ` Genki Sky
2018-11-07 20:55 ` Guenter Roeck
2018-11-07 21:07 ` Genki Sky
2018-11-07 21:18 ` Doug Anderson
2018-11-07 21:26 ` Genki Sky
2018-11-08 3:16 ` Brian Norris
2018-11-09 2:55 ` Masahiro Yamada
2018-11-09 18:34 ` [PATCH] scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks Brian Norris
2018-11-09 20:43 ` Guenter Roeck
2018-11-10 8:58 ` Genki Sky
2018-11-10 10:42 ` Andreas Schwab [this message]
2018-11-10 20:10 ` Genki Sky
2018-11-11 14:48 ` Alexander Kapshuk
2018-11-11 15:03 ` Alexander Kapshuk
2018-11-11 17:41 ` Genki Sky
2018-11-11 19:59 ` Alexander Kapshuk
2018-11-12 8:42 ` Alexander Kapshuk
2018-11-13 0:09 ` Brian Norris
2018-11-13 8:35 ` Alexander Kapshuk
2018-11-13 18:32 ` Brian Norris
2018-11-13 19:03 ` [PATCH v2] " Brian Norris
2018-11-13 19:47 ` Genki Sky
2018-11-13 22:03 ` Andreas Schwab
2018-11-15 2:06 ` Brian Norris
2018-11-15 2:11 ` [PATCH v3] " Brian Norris
2018-11-16 15:17 ` Masahiro Yamada
2018-11-19 14:42 ` Masahiro Yamada
2018-11-13 19:15 ` [PATCH] " Alexander Kapshuk
2018-11-09 2:55 ` [PATCH] Revert "scripts/setlocalversion: git: Make -dirty check more robust" Masahiro Yamada
2018-11-09 16:39 ` Masahiro Yamada
2018-11-09 16:39 ` Masahiro Yamada
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=m24lcpjjss.fsf@linux-m68k.org \
--to=schwab@linux-m68k.org \
--cc=briannorris@chromium.org \
--cc=dianders@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=lists@nerdbynature.de \
--cc=sky@genki.is \
--cc=yamada.masahiro@socionext.com \
/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;
as well as URLs for NNTP newsgroup(s).