Hedge against git completion missing, and -G for OS X