Change upstream to tracking so that it supports older gits