Fix, upstream should be correctly calculated with git < v1.8