Messages in this thread | | | Date | Sat, 10 Nov 2018 12:10:51 -0800 | From | Genki Sky <> | Subject | Re: [PATCH] scripts/setlocalversion: Improve -dirty check with git-status --no-optional-locks |
| |
Hi Andreas,
On Sat, 10 Nov 2018 11:42:11 +0100, Andreas Schwab <schwab@linux-m68k.org> wrote: > 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: > >> + 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.
Ah okay, thanks. I guess GNU grep was being lenient. Well then, I think the line at least needs to be changed to:
if [ -n "$git_status" ] && echo "$git_status" | grep -qv '^.. scripts/package'; then
I'm just trying to say that in the proposed patch, if git doesn't print anything, the echo adds a newline that wasn't there before. This causes the grep -qv to exit with status 0 (because there's at least one line that doesn't contain '^.. scripts/package'). Meaning it will print dirty.
| |