Another try, to make git-prompt compatible with the differences between git 1.8.5 and others