summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-03-20 08:06:30 -0400
committerNick Mathewson <nickm@torproject.org>2020-03-20 08:06:30 -0400
commite380396d423deded74e6c0e6f6f767a1cc93df04 (patch)
tree97610d2bd2f6fd9296c9f07b147abe996e13f126
parentd4a74021e5ab9dbaf3bb27c0a52e1fd7f8f792ab (diff)
parentbb3df5f322814740d7021ae680bc387297c84e72 (diff)
downloadtor-e380396d423deded74e6c0e6f6f767a1cc93df04.tar.gz
tor-e380396d423deded74e6c0e6f6f767a1cc93df04.zip
Merge remote-tracking branch 'tor-github/pr/1823/head' into maint-0.4.3
-rw-r--r--changes/ticket33678_0433
-rw-r--r--scripts/maint/practracker/.enable_practracker_in_hooks1
2 files changed, 3 insertions, 1 deletions
diff --git a/changes/ticket33678_043 b/changes/ticket33678_043
new file mode 100644
index 0000000000..12316262fd
--- /dev/null
+++ b/changes/ticket33678_043
@@ -0,0 +1,3 @@
+ o Code simplification and refactoring:
+ - Disable our coding standards best practices tracker in our git hooks.
+ (0.4.3 branches only.) Closes ticket 33678.
diff --git a/scripts/maint/practracker/.enable_practracker_in_hooks b/scripts/maint/practracker/.enable_practracker_in_hooks
deleted file mode 100644
index a9e707f5da..0000000000
--- a/scripts/maint/practracker/.enable_practracker_in_hooks
+++ /dev/null
@@ -1 +0,0 @@
-This file is present to tell our git hooks to run practracker on this branch.