# HG changeset patch
# User Mitchell Hentges <mhentges@mozilla.com>
# Date 1593785809 0
# Node ID b53a32cabd7c338ff1cd9bf1848f6a452f887ec5
# Parent  beaa85118014dd7e98b82a5afd3548faf3f76029
Bug 1481425: Deletes automated removal of mozreview commit hook r=sheehan

When moving from mozreview to Phabricator, the old mozreview git hook
had to be removed. Logic to automate the removal of this hook was added
to vcs-setup.

This commit removes this automated removal since it has been 2 years
since it landed.

Differential Revision: https://phabricator.services.mozilla.com/D82125

diff --git a/python/mozboot/mozboot/bootstrap.py b/python/mozboot/mozboot/bootstrap.py
--- a/python/mozboot/mozboot/bootstrap.py
+++ b/python/mozboot/mozboot/bootstrap.py
@@ -599,29 +599,16 @@ def current_firefox_checkout(check_outpu
         if child == '':
             break
 
     return (None, None)
 
 
 def update_git_tools(git, root_state_dir, top_src_dir):
     """Update git tools, hooks and extensions"""
-    # Bug 1481425 - delete the git-mozreview
-    # commit message hook in .git/hooks dir
-    if top_src_dir:
-        mozreview_commit_hook = os.path.join(top_src_dir, '.git/hooks/commit-msg')
-        if os.path.exists(mozreview_commit_hook):
-            with open(mozreview_commit_hook, 'rb') as f:
-                contents = f.read()
-
-            if b'MozReview' in contents:
-                print('removing git-mozreview commit message hook...')
-                os.remove(mozreview_commit_hook)
-                print('git-mozreview commit message hook removed.')
-
     # Ensure git-cinnabar is up to date.
     cinnabar_dir = os.path.join(root_state_dir, 'git-cinnabar')
 
     # Ensure the latest revision of git-cinnabar is present.
     update_git_repo(git, 'https://github.com/glandium/git-cinnabar.git',
                     cinnabar_dir)
 
     # Perform a download of cinnabar.