Skip to content

Commit b7fc71d

Browse files
authored
[githooks] Don't run ci/check_todo.sh (#3028)
It's useful to be able to push PRs with `// XODO` comments. They'll still get blocked from being merged.
1 parent 4fe6388 commit b7fc71d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

githooks/pre-push

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ echo "Running pre-push git hook: $0"
2020
./ci/check_job_dependencies.sh >/dev/null & JOB_DEPS_PID=$!
2121
./ci/check_readme.sh >/dev/null & README_PID=$!
2222
./ci/check_stale_stderr.sh >/dev/null & STALE_STDERR_PID=$!
23-
./ci/check_todo.sh >/dev/null & XODO_PID=$!
2423
./ci/check_versions.sh >/dev/null & VERSIONS_PID=$!
2524
./ci/check_msrv_is_minimal.sh >/dev/null & MSRV_PID=$!
2625

@@ -36,7 +35,6 @@ wait $TOOLCHAINS_PID
3635
wait $JOB_DEPS_PID
3736
wait $README_PID
3837
wait $STALE_STDERR_PID
39-
wait $XODO_PID
4038
wait $VERSIONS_PID
4139
wait $MSRV_PID
4240

@@ -48,8 +46,10 @@ wait $MSRV_PID
4846
#
4947
# This was added because, in #728, we added `ci/check_all_toolchains_tested.sh`
5048
# without calling it from this script.
51-
GLOBIGNORE="./*/release_crate_version.sh" # We don't want to run this one
49+
shopt -s extglob
50+
GLOBIGNORE="./*/@(release_crate_version|check_todo).sh" # We don't want to run these
5251
for f in ./ci/*; do
5352
grep "$f" githooks/pre-push >/dev/null || { echo "$f not called from githooks/pre-push" >&2 ; exit 1; }
5453
done
5554
unset GLOBIGNORE
55+
shopt -u extglob

0 commit comments

Comments
 (0)