From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 May 2016 21:24:07 +0000 (-0700)
Subject: Merge branch 'jk/branch-shortening-funny-symrefs' into maint
X-Git-Tag: v2.8.3~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=75375ea337dcd5c3dc2f8f793d7c8a3ee59f5564;p=thirdparty%2Fgit.git

Merge branch 'jk/branch-shortening-funny-symrefs' into maint

A change back in version 2.7 to "git branch" broke display of a
symbolic ref in a non-standard place in the refs/ hierarchy (we
expect symbolic refs to appear in refs/remotes/*/HEAD to point at
the primary branch the remote has, and as .git/HEAD to point at the
branch we locally checked out).

* jk/branch-shortening-funny-symrefs:
  branch: fix shortening of non-remote symrefs
---

75375ea337dcd5c3dc2f8f793d7c8a3ee59f5564