This is to address #471 that documented unhelpfull behavour when tracking git sources. It is a back port of !580 and !628