On Thu, Nov 15, 2018 at 11:12 AM Brian Norris <[email protected]> wrote: > > git-diff-index does not refresh the index for you, so using it for a > "-dirty" check can give misleading results. Commit 6147b1cf19651 > ("scripts/setlocalversion: git: Make -dirty check more robust") tried to > fix this by switching to git-status, but it overlooked the fact that > git-status also writes to the .git directory of the source tree, which > is definitely not kosher for an out-of-tree (O=) build. That is getting > reverted. > > Fortunately, git-status now supports avoiding writing to the index via > the --no-optional-locks flag, as of git 2.14. It still calculates an > up-to-date index, but it avoids writing it out to the .git directory. > > So, let's retry the solution from commit 6147b1cf19651 using this new > flag first, and if it fails, we assume this is an older version of git > and just use the old git-diff-index method. > > It's hairy to get the 'grep -vq' (inverted matching) correct by stashing > the output of git-status (you have to be careful about the difference > betwen "empty stdin" and "blank line on stdin"), so just pipe the output > directly to grep and use a regex that's good enough for both the > git-status and git-diff-index version. > > Cc: Genki Sky <[email protected]> > Cc: Christian Kujau <[email protected]> > Cc: Guenter Roeck <[email protected]> > Suggested-by: Alexander Kapshuk <[email protected]> > Signed-off-by: Brian Norris <[email protected]>
Worked for me, and clean implementation. Nice! I will wait a few days before I pick it up in case some people may give comments, Reviewed-by, Tested-by, etc. -- Best Regards Masahiro Yamada
