From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Mar 2017 20:52:22 +0000 (-0700)
Subject: Merge branch 'jk/interpret-branch-name' into maint
X-Git-Tag: v2.13.0-rc0~51^2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=41534b626ebdf3fb4fb692749245b90ff2bb7e13;p=thirdparty%2Fgit.git

Merge branch 'jk/interpret-branch-name' into maint

"git branch @" created refs/heads/@ as a branch, and in general the
code that handled @{-1} and @{upstream} was a bit too loose in
disambiguating.

* jk/interpret-branch-name:
  checkout: restrict @-expansions when finding branch
  strbuf_check_ref_format(): expand only local branches
  branch: restrict @-expansions when deleting
  t3204: test git-branch @-expansion corner cases
  interpret_branch_name: allow callers to restrict expansions
  strbuf_branchname: add docstring
  strbuf_branchname: drop return value
  interpret_branch_name: move docstring to header file
  interpret_branch_name(): handle auto-namelen for @{-1}
---

41534b626ebdf3fb4fb692749245b90ff2bb7e13