Catch in more places the potential filelock.Timeout exception
    
    This exception is raised when the filelock reaches a given timeout (20
    seconds by default), so in every place we are interacting with a git repo
    we need to catch this exception.