commit 8ae0ecbd6a74afa6227f6e6f7af8bd82afe4c447
Author: David Goulet <dgou...@torproject.org>
Date:   Thu Jul 2 13:47:12 2020 -0400

    scripts: Add env variable to disable pre-commit hook
    
    We introduce TOR_EXTRA_PRE_COMMIT_CHECKS environment variable to run the
    pre-commit hook. The pre-push git hook will set it in order to run all
    pre-commit checks.
    
    Signed-off-by: David Goulet <dgou...@torproject.org>
---
 scripts/git/pre-commit.git-hook | 5 +++++
 scripts/git/pre-push.git-hook   | 1 +
 2 files changed, 6 insertions(+)

diff --git a/scripts/git/pre-commit.git-hook b/scripts/git/pre-commit.git-hook
index f630a242b..33af3fdf6 100755
--- a/scripts/git/pre-commit.git-hook
+++ b/scripts/git/pre-commit.git-hook
@@ -7,6 +7,11 @@
 # it fails our code formatting, changelog entry formatting, module include
 # rules, or best practices tracker.
 
+# Run only if this environment variable is set.
+if [ -z "$TOR_EXTRA_PRE_COMMIT_CHECKS" ]; then
+  exit 0
+fi
+
 workdir=$(git rev-parse --show-toplevel)
 
 cd "$workdir" || exit 1
diff --git a/scripts/git/pre-push.git-hook b/scripts/git/pre-push.git-hook
index efa45b986..f0a3a250e 100755
--- a/scripts/git/pre-push.git-hook
+++ b/scripts/git/pre-push.git-hook
@@ -83,6 +83,7 @@ do
                                    src/tools/*.[ch] \
                           )"
 
+            export TOR_EXTRA_PRE_COMMIT_CHECKS=1
             # We want word splitting here, because file names are space
             # separated
             # shellcheck disable=SC2086



_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Reply via email to