now correctly using current uid and git