Update make version to check for git.

This will prevent the version from being set to null if git isn't in the
path.

Fixes #6815