From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 Apr 2012 17:51:18 +0000 (-0700)
Subject: Merge branch 'jc/push-upstream-sanity' into maint
X-Git-Tag: v1.7.10.1~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=731673b15ee886989afe57e50450e8ad9ed9dea3;p=git.git

Merge branch 'jc/push-upstream-sanity' into maint

The 'push to upstream' implementation was broken in some corner
cases. "git push $there" without refspec, when the current branch is
set to push to a remote different from $there, used to push to $there
using the upstream information to a remote unreleated to $there.

* jc/push-upstream-sanity:
  push: error out when the "upstream" semantics does not make sense
---

731673b15ee886989afe57e50450e8ad9ed9dea3