From 8736e913993b48a37ff8b71f1a6fca400335a0d5 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Jul 17 2014 09:10:52 +0000 Subject: Rework the get_pusher method to rely on the commit first, then gitolite --- diff --git a/progit/hooks/files/progit_hook.py b/progit/hooks/files/progit_hook.py index 43cd562..911d8d9 100644 --- a/progit/hooks/files/progit_hook.py +++ b/progit/hooks/files/progit_hook.py @@ -139,9 +139,16 @@ def get_repo_name(): return repo -def get_pusher(): +def get_pusher(commit): ''' Return the name of the person that pushed the commit. ''' - return os.environ.get('GL_USER', os.environ.get('USER', 'unknown user')) + user = None + output = read_git_lines( + ['show', '--pretty=format:"%ae"', commit], keepends=False) + if output: + user = output[0].replace('"', '') + if not user: + user = os.environ.get('GL_USER', os.environ.get('USER', None)) + return user def run_as_post_receive_hook():