Merge branch 'jc/push-upstream-sanity'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Apr 2012 22:49:51 +0000 (15:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Apr 2012 22:49:51 +0000 (15:49 -0700)
Fix broken 'push to upstream' implementation.  "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


Trivial merge