Fix sometimes-spurious warning about changed config.h

After backing up and restoring config.h, `git diff-files` may report
it as potentially-changed because it isn't sure whether the index is
up to date. Use `git diff` instead: it actually reads the file.
This commit is contained in:
Gilles Peskine 2019-01-09 22:30:01 +01:00
parent c70637a5f0
commit d1174cf015

View file

@ -381,7 +381,7 @@ pre_check_git () {
exit 1 exit 1
fi fi
if ! git diff-files --quiet include/mbedtls/config.h; then if ! git diff --quiet include/mbedtls/config.h; then
err_msg "Warning - the configuration file 'include/mbedtls/config.h' has been edited. " err_msg "Warning - the configuration file 'include/mbedtls/config.h' has been edited. "
echo "You can either delete or preserve your work, or force the test by rerunning the" echo "You can either delete or preserve your work, or force the test by rerunning the"
echo "script as: $0 --force" echo "script as: $0 --force"