Merge branch 'jk/interpret-branch-name' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Mar 2017 21:35:29 +0000 (13:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Mar 2017 21:35:29 +0000 (13:35 -0800)
commit95cc55f9a34b26f623ff83c678dee2cf13e7ac54
tree20665dc7fa08418fc5b6c8e85bad48644e50c9f4
parent891ec6f5ba4590c79f142ef923ea528e260adab4
parentfd4692ff7040e690546ed139a419995e76a96196
Merge branch 'jk/interpret-branch-name' into next

"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}
builtin/branch.c
builtin/checkout.c
builtin/merge.c
cache.h
refs.c
strbuf.h