Merge branch 'jk/interpret-branch-name' into maint
commit41534b626ebdf3fb4fb692749245b90ff2bb7e13
authorJunio C Hamano <gitster@pobox.com>
Tue, 28 Mar 2017 20:52:22 +0000 (28 13:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Mar 2017 20:52:22 +0000 (28 13:52 -0700)
tree6948d02d5cc525926a01cfa1b3434a67791a6122
parente25c1229b2f7f12fd3284297a73bb889c8f35f63
parentfd4692ff7040e690546ed139a419995e76a96196
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}
builtin/branch.c
builtin/checkout.c
builtin/merge.c
cache.h
refs.c
strbuf.h