Merge remote-tracking branch 'ben/unified-revparse' into development

diff --cc src/push.c
Simple merge

diff --cc src/revparse.c
index fd62a2fd22cb97270b153713043c3734564b2e4d,62be3128a7ae305cdbbcfc0c358922ff8e66ccbd..d2c14ccbb0798cb55d4e2c2f95e384c139741481
--- 1/src/revparse.c
--- 2/src/revparse.c
+++ b/src/revparse.c
@@@ -356,9 -356,9 +356,9 @@@ static int retrieve_remote_tracking_ref
                goto cleanup;
        }
  
 -      if ((error = git_branch_tracking(&tracking, ref)) < 0)
 +      if ((error = git_branch_upstream(&tracking, ref)) < 0)
                goto cleanup;
-       
+ 
        *base_ref = tracking;
  
  cleanup: