Bug 40252 - Move git inheritance check to an earlier stage

Summary: Move git inheritance check to an earlier stage