Merge "Canonicalize project hooks path before use"
diff --git a/project.py b/project.py
index 0d49111..eb8bad3 100644
--- a/project.py
+++ b/project.py
@@ -83,7 +83,7 @@
"""
global _project_hook_list
if _project_hook_list is None:
- d = os.path.abspath(os.path.dirname(__file__))
+ d = os.path.realpath(os.path.abspath(os.path.dirname(__file__)))
d = os.path.join(d , 'hooks')
_project_hook_list = [os.path.join(d, x) for x in os.listdir(d)]
return _project_hook_list
@@ -2016,7 +2016,7 @@
self._InitHooks()
def _InitHooks(self):
- hooks = self._gitdir_path('hooks')
+ hooks = os.path.realpath(self._gitdir_path('hooks'))
if not os.path.exists(hooks):
os.makedirs(hooks)
for stock_hook in _ProjectHooks():