Also restore index for check

This commit is contained in:
Julien Cretin
2022-06-22 11:26:02 +02:00
parent 195ac4a28c
commit 7d414439fd

View File

@@ -153,6 +153,7 @@ check() {
local root="$(get_root "${module}")" local root="$(get_root "${module}")"
( set -e ( set -e
cd third_party/"${module}" cd third_party/"${module}"
git commit --allow-empty -qmi
git add . git add .
git commit --allow-empty -qmx git commit --allow-empty -qmx
local top="$(get_head)" local top="$(get_head)"
@@ -163,6 +164,7 @@ check() {
local r; if git diff "${top}" --quiet; then r=0; else r=1; fi local r; if git diff "${top}" --quiet; then r=0; else r=1; fi
git checkout -q "${top}" git checkout -q "${top}"
git reset -q HEAD~ git reset -q HEAD~
git reset -q --soft HEAD~
[[ "${r}" -eq 0 ]] \ [[ "${r}" -eq 0 ]] \
|| fail "The ${module} submodule differs from its patches." || fail "The ${module} submodule differs from its patches."
) )