| Index: gclient_scm.py
|
| diff --git a/gclient_scm.py b/gclient_scm.py
|
| index 24064f92b8814e39f418fbe4307ca7f51ed66700..f383234b323c71c0ffb85d8d2e5c61c0aa2522ec 100644
|
| --- a/gclient_scm.py
|
| +++ b/gclient_scm.py
|
| @@ -318,8 +318,10 @@ class GitWrapper(SCMWrapper):
|
| return
|
| for f in os.listdir(hook_dir):
|
| if not f.endswith('.sample') and not f.endswith('.disabled'):
|
| - os.rename(os.path.join(hook_dir, f),
|
| - os.path.join(hook_dir, f + '.disabled'))
|
| + disabled_hook_path = os.path.join(hook_dir, f + '.disabled')
|
| + if os.path.exists(disabled_hook_path):
|
| + os.remove(disabled_hook_path)
|
| + os.rename(os.path.join(hook_dir, f), disabled_hook_path)
|
|
|
| def update(self, options, args, file_list):
|
| """Runs git to update or transparently checkout the working copy.
|
|
|