Merge branch 'jk/branch-shortening-funny-symrefs'
authorJunio C Hamano <gitster@pobox.com>
Mon, 18 Apr 2016 17:49:14 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 18 Apr 2016 17:49:14 +0000 (10:49 -0700)
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

1  2 
builtin/branch.c
Simple merge