From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Jun 2015 19:17:36 +0000 (-0700)
Subject: Merge branch 'jk/at-push-sha1'
X-Git-Tag: v2.5.0-rc0~55
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4a8354bc14e20d5ca6dc353e17e5b27fefefdab;p=thirdparty%2Fgit.git

Merge branch 'jk/at-push-sha1'

Introduce <branch>@{push} short-hand to denote the remote-tracking
branch that tracks the branch at the remote the <branch> would be
pushed to.

* jk/at-push-sha1:
  for-each-ref: accept "%(push)" format
  for-each-ref: use skip_prefix instead of starts_with
  sha1_name: implement @{push} shorthand
  sha1_name: refactor interpret_upstream_mark
  sha1_name: refactor upstream_mark
  remote.c: add branch_get_push
  remote.c: return upstream name from stat_tracking_info
  remote.c: untangle error logic in branch_get_upstream
  remote.c: report specific errors from branch_get_upstream
  remote.c: introduce branch_get_upstream helper
  remote.c: hoist read_config into remote_get_1
  remote.c: provide per-branch pushremote name
  remote.c: hoist branch.*.remote lookup out of remote_get_1
  remote.c: drop "remote" pointer from "struct branch"
  remote.c: refactor setup of branch->merge list
  remote.c: drop default_remote_name variable
---

c4a8354bc14e20d5ca6dc353e17e5b27fefefdab